[pisa-src] r1346 - trunk/pisasd/sdmain.c
- From: Thomas Jansen <mithi@xxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Tue, 27 Oct 2009 16:42:49 +0100
Author: tjansen
Date: Tue Oct 27 16:42:49 2009
New Revision: 1346
Log:
Cosmetics: Moved sd_get_cmdargs() behind sd_print_usage() and
sd_print_version(). Saves 2 forward declarations.
Modified:
trunk/pisasd/sdmain.c
Modified: trunk/pisasd/sdmain.c
==============================================================================
--- trunk/pisasd/sdmain.c Tue Oct 27 16:39:46 2009 (r1345)
+++ trunk/pisasd/sdmain.c Tue Oct 27 16:42:49 2009 (r1346)
@@ -74,8 +74,6 @@
* Prototype declarations of functions.
*/
static void sd_get_cmdargs(int argc, char **argv);
-static void sd_print_usage(char **argv);
-static void sd_print_version(void);
static void sd_reload_confs(pisa_conf_packet *p);
static void sd_quit(int quitcode);
@@ -296,64 +294,6 @@
}
/**
- * Get command line arguments and parse them.
- *
- * @param argc number of command arguments
- * @param argv pointer to the array of command arguments
- */
-static void sd_get_cmdargs(int argc, char **argv)
-{
- int c = 0;
- int option_index = 0;
-
- while ((c = getopt_long(argc, argv, OPTS, sd_longopts, &option_index))
!= -1) {
- switch (c) {
-
- case 'f':
- strncpy(sd_cfg.conffile, optarg,
sizeof(sd_cfg.conffile));
- break;
-
- case 'a':
-
strncpy(authorized_cfg_file,optarg,sizeof(authorized_cfg_file));
- break;
-
- case 'i':
- strncpy(sd_cfg.ifname_eth, optarg,
sizeof(sd_cfg.ifname_eth));
- break;
-
- case 'p':
- sd_cfg.port_control = atoi(optarg);
- break;
-
- case 'q':
- sd_cfg.port_data = atoi(optarg);
- break;
-
- case 'b':
- sd_ctx.is_bgrun = TRUE;
- break;
-
- case 'd':
- strncpy(sd_cfg.debuglevel, "all",
sizeof(sd_cfg.debuglevel));
- break;
-
- case 'v':
- sd_print_version();
- break;
-
- case 'h':
- sd_print_usage(argv);
- break;
-
- default:
- sd_print_usage(argv);
- }
- }
-
- return;
-}
-
-/**
* static void sd_print_usage(char **argv)
*
* Print usage instructions of server daemon.
@@ -434,6 +374,64 @@
}
/**
+ * Get command line arguments and parse them.
+ *
+ * @param argc number of command arguments
+ * @param argv pointer to the array of command arguments
+ */
+static void sd_get_cmdargs(int argc, char **argv)
+{
+ int c = 0;
+ int option_index = 0;
+
+ while ((c = getopt_long(argc, argv, OPTS, sd_longopts, &option_index))
!= -1) {
+ switch (c) {
+
+ case 'f':
+ strncpy(sd_cfg.conffile, optarg,
sizeof(sd_cfg.conffile));
+ break;
+
+ case 'a':
+
strncpy(authorized_cfg_file,optarg,sizeof(authorized_cfg_file));
+ break;
+
+ case 'i':
+ strncpy(sd_cfg.ifname_eth, optarg,
sizeof(sd_cfg.ifname_eth));
+ break;
+
+ case 'p':
+ sd_cfg.port_control = atoi(optarg);
+ break;
+
+ case 'q':
+ sd_cfg.port_data = atoi(optarg);
+ break;
+
+ case 'b':
+ sd_ctx.is_bgrun = TRUE;
+ break;
+
+ case 'd':
+ strncpy(sd_cfg.debuglevel, "all",
sizeof(sd_cfg.debuglevel));
+ break;
+
+ case 'v':
+ sd_print_version();
+ break;
+
+ case 'h':
+ sd_print_usage(argv);
+ break;
+
+ default:
+ sd_print_usage(argv);
+ }
+ }
+
+ return;
+}
+
+/**
* Terminate PISA server daemon by receiving signal
*
* @param quitcode signal quit code
Other related posts:
- » [pisa-src] r1346 - trunk/pisasd/sdmain.c - Thomas Jansen
