[SCM] GNU Mailutils branch, master, updated. release-2.2-807-gd644964

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=d644964e497147d7a3ee0e0693f37ec917a6c738

The branch, master has been updated
       via  d644964e497147d7a3ee0e0693f37ec917a6c738 (commit)
      from  d434dd4bf5d822eaaa42f1a2288ab303f77ab5ad (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 d644964e497147d7a3ee0e0693f37ec917a6c738
Author: Sergey Poznyakoff <[email protected]>
Date:   Wed Nov 2 15:38:41 2016 +0200

    Bugfix
    
    * libmailutils/cfg/parser.y (mu_cfg_parse_config): Silently ignore
    ENOENT

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

Summary of changes:
 libmailutils/cfg/parser.y |   35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/libmailutils/cfg/parser.y b/libmailutils/cfg/parser.y
index 0b362a8..48f94d9 100644
--- a/libmailutils/cfg/parser.y
+++ b/libmailutils/cfg/parser.y
@@ -1530,15 +1530,19 @@ mu_cfg_parse_config (mu_cfg_tree_t **ptree, struct mu_cfg_parse_hints *hints)
     {
       rc = mu_cfg_parse_file (&tmp, hints->site_file, hints->flags);
       
-      if (rc == ENOMEM)
-	{
-	  mu_error ("%s", mu_strerror (rc));
-	  return rc;
-	}
-      else if (rc == 0)
+      switch (rc)
 	{
+	case 0:
 	  mu_cfg_tree_postprocess (tmp, hints);
 	  mu_cfg_tree_union (&tree, &tmp);
+	  
+	case ENOENT:
+	  rc = 0;
+	  break;
+
+	default:
+	  mu_error ("%s", mu_strerror (rc));
+	  return rc;
 	}
     }
 
@@ -1556,19 +1560,22 @@ mu_cfg_parse_config (mu_cfg_tree_t **ptree, struct mu_cfg_parse_hints *hints)
 	  strcat (file_name, hints->program);
 	  
 	  rc = mu_cfg_parse_file (&tmp, file_name, xhints.flags);
-	  if (rc == ENOMEM)
+	  switch (rc)
 	    {
+	    case 0:
+	      mu_cfg_tree_postprocess (tmp, &xhints);
+	      mu_cfg_tree_union (&tree, &tmp);
+	      break;
+
+	    case ENOENT:
+	      rc = 0;
+	      break;
+	      
+	    default:
 	      mu_error ("%s", mu_strerror (rc));
 	      mu_cfg_destroy_tree (&tree);
 	      return rc;
 	    }
-	  else if (rc == 0)
-	    {
-	      mu_cfg_tree_postprocess (tmp, &xhints);
-	      mu_cfg_tree_union (&tree, &tmp);
-	    }
-	  else if (rc == ENOENT)
-	    rc = 0;
 	  free (file_name);
 	}
     }


hooks/post-receive
-- 
GNU Mailutils