[SCM] GNU Mailutils branch, master, updated. release-2.2-420-g4fe85f7

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=4fe85f71cba8d7063f30a4b45fc0cc2f557f8681

The branch, master has been updated
       via  4fe85f71cba8d7063f30a4b45fc0cc2f557f8681 (commit)
      from  47f26faaecf71ffc88640f5b139eaf87e59d68f2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4fe85f71cba8d7063f30a4b45fc0cc2f557f8681
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Nov 1 16:42:02 2011 +0200

    Minor changes.
    
    * mu/dbm.c: Remove unused variables.
    * mu/wicket.c (wicket_args_doc): Fix argument name.

-----------------------------------------------------------------------

Summary of changes:
 mu/dbm.c    |   12 +++++-------
 mu/wicket.c |    2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/mu/dbm.c b/mu/dbm.c
index 8a9995b..7f275e2 100644
--- a/mu/dbm.c
+++ b/mu/dbm.c
@@ -44,7 +44,6 @@ static char dbm_args_doc[] = N_("COMMAND FILE [KEY...]");
 
 enum mode
   {
-    mode_unspecified,
     mode_list,
     mode_dump,
     mode_create,
@@ -148,7 +147,7 @@ set_db_ownership (mu_dbm_file_t db)
          if (!(known_meta_data & META_UID))
            {
              mu_error (_("no such user: %s"), owner_user);
-             exit (EX_DATAERR);
+             exit (EX_NOUSER);
            }
        }
       else
@@ -314,7 +313,6 @@ static struct xfer_format format_tab[] = {
   { "1.0", newfmt_init, newfmt_reader, newfmt_writer, NULL },
   { NULL }
 };
-static int format_count = MU_ARRAY_SIZE (format_tab) - 1;
                                                     
 #define DEFAULT_LIST_FORMAT (&format_tab[0])
 #define DEFAULT_DUMP_FORMAT (&format_tab[1])
@@ -473,7 +471,7 @@ newfmt_read_datum (struct iobuf *iop, mu_opool_t pool,
   if (rc)
     {
       mu_error ("%s", mu_strerror (rc));
-      exit (EX_UNAVAILABLE);
+      exit (EX_IOERR);
     }
   if (iop->length == 0)
     return 1;
@@ -505,7 +503,7 @@ newfmt_read_datum (struct iobuf *iop, mu_opool_t pool,
       if (rc)
        {
          mu_error ("%s", mu_strerror (rc));
-         exit (EX_UNAVAILABLE);
+         exit (EX_IOERR);
        }
       if (iop->length == 0)
        break;
@@ -892,7 +890,7 @@ _set_uid (const char *val)
   if (*p || errno)
     {
       mu_error (_("invalid UID"));
-      exit (EX_DATAERR);
+      exit (EX_NOUSER);
     }
   owner_uid = n;
   known_meta_data |= META_UID;
@@ -1178,7 +1176,7 @@ add_records (int mode, int replace)
        {
          mu_error (_("cannot open input file %s: %s"), input_file,
                    mu_strerror (rc));
-         exit (EX_UNAVAILABLE);
+         exit (EX_NOINPUT);
        }
     }
   else
diff --git a/mu/wicket.c b/mu/wicket.c
index 79437dc..f01b148 100644
--- a/mu/wicket.c
+++ b/mu/wicket.c
@@ -24,7 +24,7 @@
 
 static char wicket_doc[] = N_("mu wicket - find matching URL in wicket");
 char wicket_docstring[] = N_("scan wickets for matching URLs");
-static char wicket_args_doc[] = N_("NAME");
+static char wicket_args_doc[] = N_("URL");
 
 static struct argp_option wicket_options[] = {
   { "file",    'f', N_("FILE"), 0, N_("use FILE instead of ~/.mu-tickets") },


hooks/post-receive
-- 
GNU Mailutils