cleanup: use "mh" for flux_msg_handler_t var

Use a more sensible variable name for flux_msg_handler_t
than "w", etc..

Fixes flux-framework#1219

doc/man3/treduce.c

@@ -73,7 +73,7 @@ void reduce (flux_reduce_t *r, int batchnum, void *arg)
     }
 }
 
-void forward_cb (flux_t *h, flux_msg_handler_t *w,
+void forward_cb (flux_t *h, flux_msg_handler_t *mh,
                  const flux_msg_t *msg, void *arg)
 {
     struct context *ctx = arg;
@@ -94,7 +94,7 @@ void forward_cb (flux_t *h, flux_msg_handler_t *w,
     Jput (in);
 }
 
-void heartbeat_cb (flux_t *h, flux_msg_handler_t *w,
+void heartbeat_cb (flux_t *h, flux_msg_handler_t *mh,
                    const flux_msg_t *msg, void *arg)
 {
     struct context *ctx = arg;

src/broker/attr.c

@@ -316,7 +316,7 @@ const char *attr_next (attr_t *attrs)
  ** Service
  **/
 
-void getattr_request_cb (flux_t *h, flux_msg_handler_t *w,
+void getattr_request_cb (flux_t *h, flux_msg_handler_t *mh,
                          const flux_msg_t *msg, void *arg)
 {
     attr_t *attrs = arg;
@@ -342,7 +342,7 @@ void getattr_request_cb (flux_t *h, flux_msg_handler_t *w,
         FLUX_LOG_ERROR (h);
 }
 
-void setattr_request_cb (flux_t *h, flux_msg_handler_t *w,
+void setattr_request_cb (flux_t *h, flux_msg_handler_t *mh,
                          const flux_msg_t *msg, void *arg)
 {
     attr_t *attrs = arg;
@@ -375,7 +375,7 @@ void setattr_request_cb (flux_t *h, flux_msg_handler_t *w,
         FLUX_LOG_ERROR (h);
 }
 
-void lsattr_request_cb (flux_t *h, flux_msg_handler_t *w,
+void lsattr_request_cb (flux_t *h, flux_msg_handler_t *mh,
                         const flux_msg_t *msg, void *arg)
 {
     attr_t *attrs = arg;

src/broker/broker.c

@@ -1496,7 +1496,7 @@ static void broker_unhandle_signals (zlist_t *sigwatchers)
  ** Built-in services
  **/
 
-static void cmb_rmmod_cb (flux_t *h, flux_msg_handler_t *w,
+static void cmb_rmmod_cb (flux_t *h, flux_msg_handler_t *mh,
                           const flux_msg_t *msg, void *arg)
 {
     broker_ctx_t *ctx = arg;
@@ -1521,7 +1521,7 @@ static void cmb_rmmod_cb (flux_t *h, flux_msg_handler_t *w,
     free (name);
 }
 
-static void cmb_insmod_cb (flux_t *h, flux_msg_handler_t *w,
+static void cmb_insmod_cb (flux_t *h, flux_msg_handler_t *mh,
                            const flux_msg_t *msg, void *arg)
 {
     broker_ctx_t *ctx = arg;
@@ -1550,7 +1550,7 @@ static void cmb_insmod_cb (flux_t *h, flux_msg_handler_t *w,
     free (argz);
 }
 
-static void cmb_lsmod_cb (flux_t *h, flux_msg_handler_t *w,
+static void cmb_lsmod_cb (flux_t *h, flux_msg_handler_t *mh,
                           const flux_msg_t *msg, void *arg)
 {
     broker_ctx_t *ctx = arg;
@@ -1575,7 +1575,7 @@ static void cmb_lsmod_cb (flux_t *h, flux_msg_handler_t *w,
         flux_modlist_destroy (mods);
 }
 
-static void cmb_lspeer_cb (flux_t *h, flux_msg_handler_t *w,
+static void cmb_lspeer_cb (flux_t *h, flux_msg_handler_t *mh,
                            const flux_msg_t *msg, void *arg)
 {
     broker_ctx_t *ctx = arg;
@@ -1591,7 +1591,7 @@ static void cmb_lspeer_cb (flux_t *h, flux_msg_handler_t *w,
     free (out);
 }
 
-static void cmb_panic_cb (flux_t *h, flux_msg_handler_t *w,
+static void cmb_panic_cb (flux_t *h, flux_msg_handler_t *mh,
                           const flux_msg_t *msg, void *arg)
 {
     const char *s = NULL;
@@ -1608,7 +1608,7 @@ static void cmb_panic_cb (flux_t *h, flux_msg_handler_t *w,
         flux_log_error (h, "%s: flux_respond", __FUNCTION__);
 }
 
-static void cmb_event_mute_cb (flux_t *h, flux_msg_handler_t *w,
+static void cmb_event_mute_cb (flux_t *h, flux_msg_handler_t *mh,
                                const flux_msg_t *msg, void *arg)
 {
     broker_ctx_t *ctx = arg;
@@ -1620,7 +1620,7 @@ static void cmb_event_mute_cb (flux_t *h, flux_msg_handler_t *w,
     /* no response */
 }
 
-static void cmb_disconnect_cb (flux_t *h, flux_msg_handler_t *w,
+static void cmb_disconnect_cb (flux_t *h, flux_msg_handler_t *mh,
                                const flux_msg_t *msg, void *arg)
 {
     char *sender = NULL;;
@@ -1632,7 +1632,7 @@ static void cmb_disconnect_cb (flux_t *h, flux_msg_handler_t *w,
     /* no response */
 }
 
-static void cmb_sub_cb (flux_t *h, flux_msg_handler_t *w,
+static void cmb_sub_cb (flux_t *h, flux_msg_handler_t *mh,
                         const flux_msg_t *msg, void *arg)
 {
     broker_ctx_t *ctx = arg;
@@ -1659,7 +1659,7 @@ static void cmb_sub_cb (flux_t *h, flux_msg_handler_t *w,
     free (uuid);
 }
 
-static void cmb_unsub_cb (flux_t *h, flux_msg_handler_t *w,
+static void cmb_unsub_cb (flux_t *h, flux_msg_handler_t *mh,
                           const flux_msg_t *msg, void *arg)
 {
     broker_ctx_t *ctx = arg;

src/broker/content-cache.c

@@ -347,7 +347,7 @@ static int cache_load (content_cache_t *cache, struct cache_entry *e)
     return rc;
 }
 
-void content_load_request (flux_t *h, flux_msg_handler_t *w,
+void content_load_request (flux_t *h, flux_msg_handler_t *mh,
                            const flux_msg_t *msg, void *arg)
 {
     content_cache_t *cache = arg;
@@ -514,7 +514,7 @@ static int cache_store (content_cache_t *cache, struct cache_entry *e)
     return rc;
 }
 
-static void content_store_request (flux_t *h, flux_msg_handler_t *w,
+static void content_store_request (flux_t *h, flux_msg_handler_t *mh,
                                    const flux_msg_t *msg, void *arg)
 {
     content_cache_t *cache = arg;
@@ -632,7 +632,7 @@ static int cache_flush (content_cache_t *cache)
     return rc;
 }
 
-static void content_backing_request (flux_t *h, flux_msg_handler_t *w,
+static void content_backing_request (flux_t *h, flux_msg_handler_t *mh,
                                      const flux_msg_t *msg, void *arg)
 {
     content_cache_t *cache = arg;
@@ -672,7 +672,7 @@ static void content_backing_request (flux_t *h, flux_msg_handler_t *w,
  * N.B. this walks the entire cache in one go.
  */
 
-static void content_dropcache_request (flux_t *h, flux_msg_handler_t *w,
+static void content_dropcache_request (flux_t *h, flux_msg_handler_t *mh,
                                        const flux_msg_t *msg, void *arg)
 {
     content_cache_t *cache = arg;
@@ -715,7 +715,7 @@ static void content_dropcache_request (flux_t *h, flux_msg_handler_t *w,
 /* Return stats about the cache.
  */
 
-static void content_stats_request (flux_t *h, flux_msg_handler_t *w,
+static void content_stats_request (flux_t *h, flux_msg_handler_t *mh,
                                    const flux_msg_t *msg, void *arg)
 {
     content_cache_t *cache = arg;
@@ -758,7 +758,7 @@ static void flush_respond (content_cache_t *cache)
                         __FUNCTION__);
 }
 
-static void content_flush_request (flux_t *h, flux_msg_handler_t *w,
+static void content_flush_request (flux_t *h, flux_msg_handler_t *mh,
                                    const flux_msg_t *msg, void *arg)
 {
     content_cache_t *cache = arg;
@@ -841,7 +841,7 @@ static int cache_purge (content_cache_t *cache)
     return rc;
 }
 
-static void heartbeat_event (flux_t *h, flux_msg_handler_t *w,
+static void heartbeat_event (flux_t *h, flux_msg_handler_t *mh,
                              const flux_msg_t *msg, void *arg)
 {
     content_cache_t *cache = arg;

src/broker/exec.c

@@ -202,7 +202,7 @@ static int write_to_child (struct subprocess *p, const char *s)
     return rc;
 }
 
-static void write_request_cb (flux_t *h, flux_msg_handler_t *w,
+static void write_request_cb (flux_t *h, flux_msg_handler_t *mh,
                               const flux_msg_t *msg, void *arg)
 {
     exec_t *x = arg;
@@ -235,7 +235,7 @@ static void write_request_cb (flux_t *h, flux_msg_handler_t *w,
         flux_log_error (h, "write_request_cb: flux_respond_pack");
 }
 
-static void signal_request_cb (flux_t *h, flux_msg_handler_t *w,
+static void signal_request_cb (flux_t *h, flux_msg_handler_t *mh,
                                const flux_msg_t *msg, void *arg)
 {
     exec_t *x = arg;
@@ -346,7 +346,7 @@ static int prepare_subprocess (exec_t *x,
     return -1;
 }
 
-static void exec_request_cb (flux_t *h, flux_msg_handler_t *w,
+static void exec_request_cb (flux_t *h, flux_msg_handler_t *mh,
                              const flux_msg_t *msg, void *arg)
 {
     exec_t *x = arg;
@@ -475,7 +475,7 @@ static json_t *subprocess_json_info (struct subprocess *p)
     return NULL;
 }
 
-static void ps_request_cb (flux_t *h, flux_msg_handler_t *w,
+static void ps_request_cb (flux_t *h, flux_msg_handler_t *mh,
                            const flux_msg_t *msg, void *arg)
 {
     struct subprocess *p;

src/broker/heaptrace.c

@@ -38,7 +38,7 @@
 #include <flux/core.h>
 #include "heaptrace.h"
 
-static void start_cb (flux_t *h, flux_msg_handler_t *w,
+static void start_cb (flux_t *h, flux_msg_handler_t *mh,
                       const flux_msg_t *msg, void *arg)
 {
     const char *filename;
@@ -63,7 +63,7 @@ static void start_cb (flux_t *h, flux_msg_handler_t *w,
         FLUX_LOG_ERROR (h);
 }
 
-static void dump_cb (flux_t *h, flux_msg_handler_t *w,
+static void dump_cb (flux_t *h, flux_msg_handler_t *mh,
                      const flux_msg_t *msg, void *arg)
 {
     const char *reason;
@@ -88,7 +88,7 @@ static void dump_cb (flux_t *h, flux_msg_handler_t *w,
         FLUX_LOG_ERROR (h);
 }
 
-static void stop_cb (flux_t *h, flux_msg_handler_t *w,
+static void stop_cb (flux_t *h, flux_msg_handler_t *mh,
                      const flux_msg_t *msg, void *arg)
 {
     if (flux_request_decode (msg, NULL, NULL) < 0)

src/broker/heartbeat.c

@@ -38,7 +38,7 @@ struct heartbeat_struct {
     flux_t *h;
     double rate;
     flux_watcher_t *timer;
-    flux_msg_handler_t *handler;
+    flux_msg_handler_t *mh;
     int send_epoch;
     int epoch;
 };
@@ -52,7 +52,7 @@ void heartbeat_destroy (heartbeat_t *hb)
 {
     if (hb) {
         flux_watcher_destroy (hb->timer);
-        flux_msg_handler_destroy (hb->handler);
+        flux_msg_handler_destroy (hb->mh);
         free (hb);
     }
 }
@@ -116,7 +116,7 @@ int heartbeat_get_epoch (heartbeat_t *hb)
     return hb->epoch;
 }
 
-static void event_cb (flux_t *h, flux_msg_handler_t *w,
+static void event_cb (flux_t *h, flux_msg_handler_t *mh,
                       const flux_msg_t *msg, void *arg)
 {
     heartbeat_t *hb = arg;
@@ -167,18 +167,18 @@ int heartbeat_start (heartbeat_t *hb)
         flux_watcher_start (hb->timer);
     }
     match.topic_glob = "hb";
-    if (!(hb->handler = flux_msg_handler_create (hb->h, match, event_cb, hb)))
+    if (!(hb->mh = flux_msg_handler_create (hb->h, match, event_cb, hb)))
         return -1;
-    flux_msg_handler_start (hb->handler);
+    flux_msg_handler_start (hb->mh);
     return 0;
 }
 
 void heartbeat_stop (heartbeat_t *hb)
 {
     if (hb->timer)
         flux_watcher_stop (hb->timer);
-    if (hb->handler)
-        flux_msg_handler_stop (hb->handler);
+    if (hb->mh)
+        flux_msg_handler_stop (hb->mh);
 }
 
 /*

src/broker/hello.c

@@ -54,7 +54,7 @@ struct hello_struct {
     flux_reduce_t *reduce;
 };
 
-static void join_request (flux_t *h, flux_msg_handler_t *w,
+static void join_request (flux_t *h, flux_msg_handler_t *mh,
                           const flux_msg_t *msg, void *arg);
 
 static void r_reduce (flux_reduce_t *r, int batch, void *arg);
@@ -212,7 +212,7 @@ int hello_start (hello_t *hello)
 
 /* handle a message sent from downstream via downstream's r_forward op.
  */
-static void join_request (flux_t *h, flux_msg_handler_t *w,
+static void join_request (flux_t *h, flux_msg_handler_t *mh,
                           const flux_msg_t *msg, void *arg)
 {
     hello_t *hello = arg;