OSDN Git Service

obexd: Reorder command line options
authorMarcel Holtmann <marcel@holtmann.org>
Wed, 19 Dec 2012 12:42:35 +0000 (13:42 +0100)
committerMarcel Holtmann <marcel@holtmann.org>
Wed, 19 Dec 2012 12:43:00 +0000 (13:43 +0100)
obexd/src/main.c

index 5d03717..9e38126 100644 (file)
@@ -158,12 +158,16 @@ static gboolean parse_debug(const char *key, const char *value,
 }
 
 static GOptionEntry options[] = {
-       { "nodaemon", 'n', G_OPTION_FLAG_REVERSE,
-                               G_OPTION_ARG_NONE, &option_detach,
-                               "Run with logging in foreground" },
        { "debug", 'd', G_OPTION_FLAG_OPTIONAL_ARG,
                                G_OPTION_ARG_CALLBACK, parse_debug,
                                "Enable debug information output", "DEBUG" },
+       { "plugin", 'p', 0, G_OPTION_ARG_STRING, &option_plugin,
+                               "Specify plugins to load", "NAME,..." },
+       { "noplugin", 'P', 0, G_OPTION_ARG_STRING, &option_noplugin,
+                               "Specify plugins not to load", "NAME,..." },
+       { "nodetach", 'n', G_OPTION_FLAG_REVERSE,
+                               G_OPTION_ARG_NONE, &option_detach,
+                               "Run with logging in foreground" },
        { "root", 'r', 0, G_OPTION_ARG_STRING, &option_root,
                                "Specify root folder location. Both absolute "
                                "and relative can be used, but relative paths "
@@ -179,10 +183,6 @@ static GOptionEntry options[] = {
                                "scripts", "FILE" },
        { "auto-accept", 'a', 0, G_OPTION_ARG_NONE, &option_autoaccept,
                                "Automatically accept push requests" },
-       { "plugin", 'p', 0, G_OPTION_ARG_STRING, &option_plugin,
-                               "Specify plugins to load", "NAME,..." },
-       { "noplugin", 'P', 0, G_OPTION_ARG_STRING, &option_noplugin,
-                               "Specify plugins not to load", "NAME,..." },
        { NULL },
 };