Fixed use of OPTION_DOC options.

Sergey Poznyakoff
Commit f333a7c9 ... f333a7c9189a3eb2f2b6538b203b593f97b6942b authored 2003-01-26 13:55:01 +0000 by Sergey Poznyakoff
Showing 6 changed files with 20 additions and 22 deletions
mh/comp.c
mh/fmtcheck.c
mh/inc.c
mh/mhpath.c
mh/rmf.c
sieve/sieve.c
--- a/mh/comp.c
View file @f333a7c
+++ b/mh/comp.c
View file @f333a7c
@@ -22,7 +22,8 @@
 #include <sys/stat.h>
 const char *argp_program_version = "comp (" PACKAGE_STRING ")";
-static char doc[] = "GNU MH comp";
+static char doc[] = N_("GNU MH comp\v"
+"Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = "[msg]";
 #define ARG_NOEDIT      1
@@ -49,7 +50,6 @@ static struct argp_option options[] = {
  {"whatnowproc", ARG_WHATNOWPROC, N_("PROG"), 0,
   N_("Set the replacement for whatnow program")},
  {"use", 'u', N_("BOOL"), OPTION_ARG_OPTIONAL, N_("Use draft file preserved after the last session") },
-  { N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
  { 0 }
 };
--- a/mh/fmtcheck.c
View file @f333a7c
+++ b/mh/fmtcheck.c
View file @f333a7c
@@ -20,7 +20,8 @@
 #include <mh.h>
 const char *argp_program_version = "fmtcheck (" PACKAGE_STRING ")";
-static char doc[] = "GNU MH fmtcheck";
+static char doc[] = N_("GNU MH fmtcheck\v"
+"Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = "";
 /* GNU options */
@@ -28,7 +29,6 @@ static struct argp_option options[] = {
  {"form",    'F', N_("FILE"),   0, N_("Read format from given file")},
  {"format",  't', N_("FORMAT"), 0, N_("Use this format string")},
  {"dump",    'd', NULL,     0, N_("Dump the listing of compiled format code")},
-  { N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
  { 0 }
 };
--- a/mh/inc.c
View file @f333a7c
+++ b/mh/inc.c
View file @f333a7c
@@ -20,7 +20,8 @@
 #include <mh.h>
 const char *argp_program_version = "inc (" PACKAGE_STRING ")";
-static char doc[] = "GNU MH inc";
+static char doc[] = N_("GNU MH inc\v"
+"Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[+folder]");
 /* GNU options */
@@ -38,9 +39,6 @@ static struct argp_option options[] = {
  {"width",   'w', N_("NUMBER"), 0, N_("Set output width")},
  {"quiet",   'q', 0,        0, N_("Be quiet")},
  {"license", 'l', 0,        0, N_("Display software license"), -1},
-  { N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
  { 0 }
 };
--- a/mh/mhpath.c
View file @f333a7c
+++ b/mh/mhpath.c
View file @f333a7c
@@ -20,13 +20,13 @@
 #include <mh.h>
 const char *argp_program_version = "mhpath (" PACKAGE_STRING ")";
-static char doc[] = "GNU MH mhpath";
+static char doc[] = N_("GNU MH mhpath\v"
+"Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[+folder] [msgs]");
 /* GNU options */
 static struct argp_option options[] = {
  {"folder",  'f', N_("FOLDER"), 0, N_("Specify folder to operate upon")},
-  { N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
  { 0 }
 };
--- a/mh/rmf.c
View file @f333a7c
+++ b/mh/rmf.c
View file @f333a7c
@@ -29,7 +29,8 @@
 #include <dirent.h>
 const char *argp_program_version = "rmf (" PACKAGE_STRING ")";
-static char doc[] = "GNU MH rmf";
+static char doc[] = N_("GNU MH rmf\v"
+"Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[+folder]");
 /* GNU options */
@@ -38,7 +39,6 @@ static struct argp_option options[] = {
  {"interactive", 'i', N_("BOOL"), OPTION_ARG_OPTIONAL,
    N_("Interactive mode: ask for confirmation before removing each folder")},
  {"recursive", 'r', NULL, 0, N_("Recursively delete all subfolders")},
-  { N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
  { 0 }
 };
--- a/sieve/sieve.c
View file @f333a7c
+++ b/sieve/sieve.c
View file @f333a7c
@@ -361,13 +361,13 @@ main (int argc, char *argv[])
    {
      if ((rc = wicket_create (&wicket, opts.tickets)) != 0)
 	{
-	  mu_error (_("wicket create <%s> failed: %s\n"),
+	  mu_error (_("wicket_create <%s> failed: %s"),
 		   opts.tickets, mu_strerror (rc));
 	  goto cleanup;
 	}
      if ((rc = wicket_get_ticket (wicket, &ticket, 0, 0)) != 0)
 	{
-	  mu_error (_("ticket get failed: %s\n"), mu_strerror (rc));
+	  mu_error (_("ticket_get failed: %s"), mu_strerror (rc));
 	  goto cleanup;
 	}
      sieve_set_ticket (mach, ticket);
@@ -378,18 +378,18 @@ main (int argc, char *argv[])
    {
      if ((rc = mu_debug_create (&debug, mach)))
 	{
-	  mu_error (_("mu_debug_create failed: %s\n"), mu_strerror (rc));
+	  mu_error (_("mu_debug_create failed: %s"), mu_strerror (rc));
 	  goto cleanup;
 	}
      if ((rc = mu_debug_set_level (debug, opts.debug_level)))
 	{
-	  mu_error (_("mu_debug_set_level failed: %s\n"),
+	  mu_error (_("mu_debug_set_level failed: %s"),
 		    mu_strerror (rc));
 	  goto cleanup;
 	}
      if ((rc = mu_debug_set_print (debug, debugfp, mach)))
 	{
-	  mu_error (_("mu_debug_set_print failed: %s\n"),
+	  mu_error (_("mu_debug_set_print failed: %s"),
 		    mu_strerror (rc));
 	  goto cleanup;
 	}
@@ -400,14 +400,14 @@ main (int argc, char *argv[])
  /* Create, give a ticket to, and open the mailbox. */
  if ((rc = mailbox_create_default (&mbox, opts.mbox)) != 0)
    {
-      mu_error (_("mailbox create <%s> failed: %s\n"),
+      mu_error (_("mailbox_create <%s> failed: %s"),
 	       opts.mbox ? opts.mbox : _("default"), mu_strerror (rc));
      goto cleanup;
    }
  if (debug && (rc = mailbox_set_debug (mbox, debug)))
    {
-      mu_error (_("mailbox_set_debug failed: %s\n"), mu_strerror (rc));
+      mu_error (_("mailbox_set_debug failed: %s"), mu_strerror (rc));
      goto cleanup;
    }
@@ -447,8 +447,8 @@ main (int argc, char *argv[])
  if (rc != 0)
    {
-      mu_error (_("open on %s failed: %s\n"),
+      mu_error (_("open on %s failed: %s"),
-	       opts.mbox ? opts.mbox : _("default"), mu_strerror (rc));
+		opts.mbox ? opts.mbox : _("default"), mu_strerror (rc));
      goto cleanup;
    }
@@ -465,7 +465,7 @@ cleanup:
         any messages that were marked DELETED even if execution failed
         on a later message. */
      if ((e = mailbox_expunge (mbox)) != 0)
-	mu_error (_("expunge on %s failed: %s\n"),
+	mu_error (_("expunge on %s failed: %s"),
 		  opts.mbox ? opts.mbox : _("default"), mu_strerror (e));
      if (e && !rc)