X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fmemstat.c;h=f2dcfd89489f9607e7b0a2d0266f04c82e146801;hb=a5c71cf51ad345bee6f5890cc9bbad9f1d2444c9;hp=36ee343e156745baafb45034a4f4271ccb407e76;hpb=1d7f999b7d38db3308a0533a83fea23987fb0178;p=awesomized%2Flibmemcached

diff --git a/clients/memstat.c b/clients/memstat.c
index 36ee343e..f2dcfd89 100644
--- a/clients/memstat.c
+++ b/clients/memstat.c
@@ -16,15 +16,27 @@
 #define PROGRAM_DESCRIPTION "Output the state of a memcached cluster."
 
 /* Prototypes */
-void options_parse(int argc, char *argv[]);
+static void options_parse(int argc, char *argv[]);
+static void print_server_listing(memcached_st *memc, memcached_stat_st *stat,
+                                 memcached_server_st *server_list);
 
 static int opt_verbose= 0;
 static int opt_displayflag= 0;
 static char *opt_servers= NULL;
 
+static struct option long_options[]=
+{
+  {"version", no_argument, NULL, OPT_VERSION},
+  {"help", no_argument, NULL, OPT_HELP},
+  {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},
+  {"debug", no_argument, &opt_verbose, OPT_DEBUG},
+  {"servers", required_argument, NULL, OPT_SERVERS},
+  {"flag", no_argument, &opt_displayflag, OPT_FLAG},
+  {0, 0, 0, 0},
+};
+
 int main(int argc, char *argv[])
 {
-  unsigned int x;
   memcached_return rc;
   memcached_st *memc;
   memcached_stat_st *stat;
@@ -41,7 +53,8 @@ int main(int argc, char *argv[])
       opt_servers= strdup(temp);
     else
     {
-      fprintf(stderr, "No Servers provided\n");
+      fprintf(stderr, "No Servers provided\n\n");
+      help_command(PROGRAM_NAME, PROGRAM_DESCRIPTION, long_options, 0);
       exit(1);
     }
   }
@@ -62,6 +75,21 @@ int main(int argc, char *argv[])
   }
 
   server_list= memcached_server_list(memc);
+  print_server_listing(memc, stat, server_list);
+
+  free(stat);
+  free(opt_servers);
+
+  memcached_free(memc);
+
+  return 0;
+}
+
+static void print_server_listing(memcached_st *memc, memcached_stat_st *stat,
+                                 memcached_server_st *server_list)
+{
+  unsigned int x;
+  memcached_return rc;
 
   printf("Listing %u Server\n\n", memcached_server_count(memc));
   for (x= 0; x < memcached_server_count(memc); x++)
@@ -72,7 +100,7 @@ int main(int argc, char *argv[])
     list= memcached_stat_get_keys(memc, &stat[x], &rc);
 
     printf("Server: %s (%u)\n", memcached_server_name(memc, server_list[x]),
-	   memcached_server_port(memc, server_list[x]));
+           memcached_server_port(memc, server_list[x]));
     for (ptr= list; *ptr; ptr++)
     {
       memcached_return rc;
@@ -85,33 +113,15 @@ int main(int argc, char *argv[])
     free(list);
     printf("\n");
   }
-
-  free(stat);
-  free(opt_servers);
-
-  memcached_free(memc);
-
-  return 0;
 }
 
-void options_parse(int argc, char *argv[])
+static void options_parse(int argc, char *argv[])
 {
   memcached_programs_help_st help_options[]=
   {
     {0},
   };
 
-  static struct option long_options[]=
-  {
-    {"version", no_argument, NULL, OPT_VERSION},
-    {"help", no_argument, NULL, OPT_HELP},
-    {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},
-    {"debug", no_argument, &opt_verbose, OPT_DEBUG},
-    {"servers", required_argument, NULL, OPT_SERVERS},
-    {"flag", no_argument, &opt_displayflag, OPT_FLAG},
-    {0, 0, 0, 0},
-  };
-
   int option_index= 0;
   int option_rv;