# HG changeset patch # User Jim Meyering # Date 884428117 0 # Node ID 5032c8c662573e96f13b56bc0d75e11ece78f375 # Parent 594755a693bf8ab6ac5bb49ecb406cc051eb6bf2 (make_path): Reformat 3 if-stmts to test `if (newly_created_dir)' only once. Suggestion from Andreas Schwab. diff --git a/lib/makepath.c b/lib/makepath.c --- a/lib/makepath.c +++ b/lib/makepath.c @@ -239,29 +239,31 @@ } } - if (newly_created_dir && verbose_fmt_string != NULL) - fprintf (stderr, verbose_fmt_string, dirpath); - - if (newly_created_dir - && (owner != (uid_t) -1 || group != (gid_t) -1) - && chown (basename_dir, owner, group) -#if defined(AFS) && defined (EPERM) - && errno != EPERM -#endif - ) + if (newly_created_dir) { - error (0, errno, "%s", dirpath); - CLEANUP; - return 1; - } + if (verbose_fmt_string) + fprintf (stderr, verbose_fmt_string, dirpath); - if (newly_created_dir && re_protect) - { - struct ptr_list *new = (struct ptr_list *) - alloca (sizeof (struct ptr_list)); - new->dirname_end = slash; - new->next = leading_dirs; - leading_dirs = new; + if ((owner != (uid_t) -1 || group != (gid_t) -1) + && chown (basename_dir, owner, group) +#if defined(AFS) && defined (EPERM) + && errno != EPERM +#endif + ) + { + error (0, errno, "%s", dirpath); + CLEANUP; + return 1; + } + + if (re_protect) + { + struct ptr_list *new = (struct ptr_list *) + alloca (sizeof (struct ptr_list)); + new->dirname_end = slash; + new->next = leading_dirs; + leading_dirs = new; + } } /* If we were able to save the initial working directory,