[SCM] GNU Mailutils branch, master, updated. mu-1-2-90-separate-argp-cfg-268-gcbdb11e

[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=cbdb11e15c5c46c7e68602fde5de16bcd6ed4842

The branch, master has been updated
       via  cbdb11e15c5c46c7e68602fde5de16bcd6ed4842 (commit)
      from  fd5b5599ee96293812d33f8dcb837ada35526097 (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 cbdb11e15c5c46c7e68602fde5de16bcd6ed4842
Author: Sergey Poznyakoff <address@hidden>
Date:   Mon May 25 13:50:56 2009 +0300

    Fix some special cases of using mu_app_init.
    
    * libmu_argp/muinit.c (mu_app_init): Allow capa==NULL.
    * mailbox/cfg_driver.c (mu_config_clone_container): Do nothing
    if cont == NULL.

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

Summary of changes:
 libmu_argp/muinit.c  |    5 +++--
 mailbox/cfg_driver.c |    2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libmu_argp/muinit.c b/libmu_argp/muinit.c
index b3f608a..575a329 100644
--- a/libmu_argp/muinit.c
+++ b/libmu_argp/muinit.c
@@ -68,8 +68,9 @@ mu_app_init (struct argp *myargp, const char **capa,
   
   mu_set_program_name (argv[0]);
   mu_libargp_init ();
-  for (i = 0; capa[i]; i++)
-    mu_gocs_register_std (capa[i]); /*FIXME*/
+  if (capa)
+    for (i = 0; capa[i]; i++)
+      mu_gocs_register_std (capa[i]); /*FIXME*/
   if (!myargp)
     myargp = &argpnull;
   argp = mu_argp_build (myargp, &excapa);
diff --git a/mailbox/cfg_driver.c b/mailbox/cfg_driver.c
index e5bdd28..88f1647 100644
--- a/mailbox/cfg_driver.c
+++ b/mailbox/cfg_driver.c
@@ -320,6 +320,8 @@ _clone_action (void *item, void *cbdata)
 int
 mu_config_clone_container (struct mu_cfg_cont *cont)
 {
+  if (!cont)
+    return 0;
   mu_refcount_inc (cont->refcount);
   /* printf("clone %p-%s: %d\n", cont, cont->v.section.ident, n); */
   switch (cont->type)


hooks/post-receive
-- 
GNU Mailutils