[Cvs-cvs] ccvs/src ChangeLog commit.c root.c subr.h

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/09 17:44:37

Modified files:
        src            : ChangeLog commit.c root.c subr.h 

Log message:
        * subr.h (PRINT_UPDATE_DIR): Rename macro to...
        (NULL2DOT): ...this.  Handle NULL input.
        * commit.c, root.c: Update all callers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3566&r2=1.3567
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/commit.c?cvsroot=cvs&r1=1.280&r2=1.281
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/root.c?cvsroot=cvs&r1=1.133&r2=1.134
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/subr.h?cvsroot=cvs&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3566
retrieving revision 1.3567
diff -u -b -r1.3566 -r1.3567
--- ChangeLog   9 Sep 2008 16:55:23 -0000       1.3566
+++ ChangeLog   9 Sep 2008 17:44:36 -0000       1.3567
@@ -1,5 +1,9 @@
 2008-09-09  Derek R. Price  <address@hidden>
 
+       * subr.h (PRINT_UPDATE_DIR): Rename macro to...
+       (NULL2DOT): ...this.  Handle NULL input.
+       * commit.c, root.c: Update all callers.
+
        * subr.c (dir_append_dirs): Fix block comment.  Accept NULL DIR arg.
        * subr.h (PRINT_UPDATE_DIR): New convenience macro.
        * commit.c (find_dirent_proc, check_dirent_proc): Use new macro.

Index: commit.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/commit.c,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -b -r1.280 -r1.281
--- commit.c    9 Sep 2008 16:55:24 -0000       1.280
+++ commit.c    9 Sep 2008 17:44:37 -0000       1.281
@@ -173,7 +173,7 @@
        code will never be run during client/server operation and we
        want the messages to match. */
     if (!quiet)
-       error (0, 0, "Examining %s", PRINT_UPDATE_DIR (update_dir));
+       error (0, 0, "Examining %s", NULL2DOT (update_dir));
 
     return R_PROCESS;
 }
@@ -1186,7 +1186,7 @@
        return R_SKIP_ALL;
 
     if (!quiet)
-       error (0, 0, "Examining %s", PRINT_UPDATE_DIR (update_dir));
+       error (0, 0, "Examining %s", NULL2DOT (update_dir));
 
     return R_PROCESS;
 }

Index: root.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/root.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- root.c      9 Sep 2008 16:55:24 -0000       1.133
+++ root.c      9 Sep 2008 17:44:37 -0000       1.134
@@ -89,7 +89,7 @@
        int saved_errno = errno;
        /* FIXME: should be checking for end of file separately; errno
           is not set in that case.  */
-       error (0, 0, "in directory %s:", PRINT_UPDATE_DIR (update_dir));
+       error (0, 0, "in directory %s:", NULL2DOT (update_dir));
        error (0, saved_errno, "cannot read %s", CVSADM_ROOT);
        error (0, 0, "please correct this problem");
        ret = NULL;
@@ -108,7 +108,7 @@
     ret = parse_cvsroot (root);
     if (ret == NULL)
     {
-       error (0, 0, "in directory %s:", PRINT_UPDATE_DIR (update_dir));
+       error (0, 0, "in directory %s:", NULL2DOT (update_dir));
        error (0, 0,
               "ignoring %s because it does not contain a valid root.",
               CVSADM_ROOT);
@@ -117,7 +117,7 @@
 
     if (!ret->isremote && !isdir (ret->directory))
     {
-       error (0, 0, "in directory %s:", PRINT_UPDATE_DIR (update_dir));
+       error (0, 0, "in directory %s:", NULL2DOT (update_dir));
        error (0, 0,
               "ignoring %s because it specifies a non-existent repository %s",
               CVSADM_ROOT, root);

Index: subr.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/subr.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- subr.h      9 Sep 2008 16:55:24 -0000       1.20
+++ subr.h      9 Sep 2008 17:44:37 -0000       1.21
@@ -173,6 +173,6 @@
 /* Convenience macro for printing the commonly used but sometimes empty
  * UPDATE_DIR string.
  */
-#define PRINT_UPDATE_DIR(u) (*u ? u : ".")
+#define NULL2DOT(u) (u && *u ? u : ".")
 
 #endif /* !SUBR_H */