[multipathd] move show_{paths,maps} in cli_handlers.c

Near their users.

diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c
index 0fb1cfb..1b2b789 100644 (file)
--- a/multipathd/cli_handlers.c
+++ b/multipathd/cli_handlers.c
@@ -17,6 +17,44 @@
 #include "cli.h"
 
 int
+show_paths (char ** r, int * len, struct vectors * vecs, char * style)
+{
+       int i;
+       struct path * pp;
+       char * c;
+       char * reply;
+       int maxlen = INITIAL_REPLY_LEN;
+       int again = 1;
+
+       get_path_layout(vecs->pathvec);
+       reply = MALLOC(maxlen);
+
+       while (again) {
+               if (!reply)
+                       return 1;
+
+               c = reply;
+
+               if (VECTOR_SIZE(vecs->pathvec) > 0)
+                       c += snprint_path_header(c, reply + maxlen - c,
+                                                style);
+
+               vector_foreach_slot(vecs->pathvec, pp, i)
+                       c += snprint_path(c, reply + maxlen - c,
+                                         style, pp);
+
+               again = ((c - reply) == (maxlen - 1));
+
+               if (again)
+                       reply = REALLOC(reply, maxlen *= 2);
+
+       }
+       *r = reply;
+       *len = (int)(c - reply + 1);
+       return 0;
+}
+
+int
 cli_list_paths (void * v, char ** reply, int * len, void * data)
 {
        struct vectors * vecs = (struct vectors *)data;
@@ -27,6 +65,42 @@ cli_list_paths (void * v, char ** reply, int * len, void * data)
 }
 
 int
+show_maps (char ** r, int *len, struct vectors * vecs, char * style)
+{
+       int i;
+       struct multipath * mpp;
+       char * c;
+       char * reply;
+       int maxlen = INITIAL_REPLY_LEN;
+       int again = 1;
+
+       get_multipath_layout(vecs->mpvec);
+       reply = MALLOC(maxlen);
+
+       while (again) {
+               if (!reply)
+                       return 1;
+
+               c = reply;
+               if (VECTOR_SIZE(vecs->mpvec) > 0)
+                       c += snprint_multipath_header(c, reply + maxlen - c,
+                                                     style);
+
+               vector_foreach_slot(vecs->mpvec, mpp, i)
+                       c += snprint_multipath(c, reply + maxlen - c,
+                                              style, mpp);
+
+               again = ((c - reply) == (maxlen - 1));
+
+               if (again)
+                       reply = REALLOC(reply, maxlen *= 2);
+       }
+       *r = reply;
+       *len = (int)(c - reply + 1);
+       return 0;
+}
+
+int
 cli_list_maps (void * v, char ** reply, int * len, void * data)
 {
        struct vectors * vecs = (struct vectors *)data;

diff --git a/multipathd/main.c b/multipathd/main.c
index 48fae6a..cef6fc2 100644 (file)
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -860,80 +860,6 @@ out:
        return 1;
 }
 
-int
-show_paths (char ** r, int * len, struct vectors * vecs, char * style)
-{
-       int i;
-       struct path * pp;
-       char * c;
-       char * reply;
-       int maxlen = INITIAL_REPLY_LEN;
-       int again = 1;
-
-       get_path_layout(vecs->pathvec);
-       reply = MALLOC(maxlen);
-
-       while (again) {
-               if (!reply)
-                       return 1;
-
-               c = reply;
-
-               if (VECTOR_SIZE(vecs->pathvec) > 0)
-                       c += snprint_path_header(c, reply + maxlen - c,
-                                                style);
-
-               vector_foreach_slot(vecs->pathvec, pp, i)
-                       c += snprint_path(c, reply + maxlen - c,
-                                         style, pp);
-
-               again = ((c - reply) == (maxlen - 1));
-
-               if (again)
-                       reply = REALLOC(reply, maxlen *= 2);
-
-       }
-       *r = reply;
-       *len = (int)(c - reply + 1);
-       return 0;
-}
-
-int
-show_maps (char ** r, int *len, struct vectors * vecs, char * style)
-{
-       int i;
-       struct multipath * mpp;
-       char * c;
-       char * reply;
-       int maxlen = INITIAL_REPLY_LEN;
-       int again = 1;
-
-       get_multipath_layout(vecs->mpvec);
-       reply = MALLOC(maxlen);
-
-       while (again) {
-               if (!reply)
-                       return 1;
-
-               c = reply;
-               if (VECTOR_SIZE(vecs->mpvec) > 0)
-                       c += snprint_multipath_header(c, reply + maxlen - c,
-                                                     style);
-
-               vector_foreach_slot(vecs->mpvec, mpp, i)
-                       c += snprint_multipath(c, reply + maxlen - c,
-                                              style, mpp);
-
-               again = ((c - reply) == (maxlen - 1));
-
-               if (again)
-                       reply = REALLOC(reply, maxlen *= 2);
-       }
-       *r = reply;
-       *len = (int)(c - reply + 1);
-       return 0;
-}
-
 static int
 map_discovery (struct vectors * vecs)
 {

diff --git a/multipathd/main.h b/multipathd/main.h
index c9a4886..a623656 100644 (file)
--- a/multipathd/main.h
+++ b/multipathd/main.h
@@ -7,8 +7,6 @@
 #define MAX_CHECKINT CHECKINT << 2
 
 int reconfigure (struct vectors *);
-int show_paths (char **, int *, struct vectors *, char *);
-int show_maps (char **, int *, struct vectors *, char *);
 int ev_add_path (char *, struct vectors *);
 int ev_remove_path (char *, struct vectors *);
 int ev_add_map (char *, struct vectors *);