Changeset 1585

Timestamp:

Mar 24, 2007, 9:23:24 AM (15 years ago)

Author:

joshe

Message:

Don't rely on on printf field numbers.

File:

• trunk/gtk/main.c (modified) (3 diffs)

trunk/gtk/main.c

@@ -265 +265 @@
         { NULL, 0, NULL, 0 }
     };
-    int opt;
+    int          opt;
+    const char * name;
 
     *sendquit    = FALSE;
@@ -271 +272 @@
 
     gtk_parse_args( &argc, &argv );
+    name = g_get_prgname();
 
     while( 0 <= ( opt = getopt_long( argc, argv, "hpqv", opts, NULL ) ) )
@@ -285 +287 @@
             case 'h':
                 printf(
-_("usage: %1$s [-hpq] [files...]\n"
+_("usage: %s [-hpq] [files...]\n"
   "\n"
-  "Transmission %2$s (r%3$d) http://transmission.m0k.org/\n"
+  "Transmission %s (r%d) http://transmission.m0k.org/\n"
   "A free, lightweight BitTorrent client with a simple, intuitive interface\n"
   "\n"
   "  -h --help    display this message and exit\n"
   "  -p --paused  start with all torrents paused\n"
-  "  -q --quit    request that the running %1$s instance quit\n"
+  "  -q --quit    request that the running %s instance quit\n"
   "\n"
-  "Only one instance of %1$s may run at one time. Multiple\n"
+  "Only one instance of %s may run at one time. Multiple\n"
   "torrent files may be loaded at startup by adding them to the command\n"
-  "line. If %1$s is already running, those torrents will be\n"
+  "line. If %s is already running, those torrents will be\n"
   "opened in the running instance.\n"),
-                        g_get_prgname(), VERSION_STRING, VERSION_REVISION );
+                        name, VERSION_STRING, VERSION_REVISION,
+                        name, name, name );
                 exit(0);
                 break;