[Cvs-cvs] ccvs/src ChangeLog diff.c

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/17 16:06:13

Modified files:
        src            : ChangeLog diff.c 

Log message:
        * diff.c (diff_fileproc, diff_dirproc): Some cleanup.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3593&r2=1.3594
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/diff.c?cvsroot=cvs&r1=1.121&r2=1.122

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3593
retrieving revision 1.3594
diff -u -b -r1.3593 -r1.3594
--- ChangeLog   17 Sep 2008 15:04:29 -0000      1.3593
+++ ChangeLog   17 Sep 2008 16:06:13 -0000      1.3594
@@ -1,5 +1,7 @@
 2008-09-17  Derek R. Price  <address@hidden>
 
+       * diff.c (diff_fileproc, diff_dirproc): Some cleanup.
+
        * entries.h: "rcs.h" already includes "hash.h".
 
 2008-09-16  Derek R. Price  <address@hidden>

Index: diff.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/diff.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- diff.c      16 Sep 2008 22:39:51 -0000      1.121
+++ diff.c      17 Sep 2008 16:06:13 -0000      1.122
@@ -28,6 +28,7 @@
 
 /* GNULIB */
 #include "minmax.h"
+#include "quote.h"
 
 /* CVS */
 #include "base.h"
@@ -775,11 +776,10 @@
        /* Skip all the following checks regarding the user file; we're
           not using it.  */
     }
-    else if (vers->vn_user == NULL)
+    else if (!vers->vn_user)
     {
        /* The file does not exist in the working directory.  */
-       if ((diff_rev1 || diff_date1)
-           && vers->srcfile != NULL)
+       if ((diff_rev1 || diff_date1) && vers->srcfile)
        {
            /* The file does exist in the repository.  */
            if (empty_files)
@@ -793,12 +793,11 @@
                if (diff_rev1 && STREQ (diff_rev1, TAG_HEAD))
                {
                    char *head =
-                       (vers->vn_rcs == NULL
-                        ? NULL
-                        : RCS_branch_head (vers->srcfile, vers->vn_rcs));
-                   exists = head != NULL && !RCS_isdead (vers->srcfile, head);
-                   if (head != NULL)
-                       free (head);
+                       vers->vn_rcs 
+                       ? RCS_branch_head (vers->srcfile, vers->vn_rcs)
+                       : NULL;
+                   exists = head && !RCS_isdead (vers->srcfile, head);
+                   if (head) free (head);
                }
                else
                {
@@ -806,8 +805,8 @@
 
                    xvers = Version_TS (finfo, NULL, diff_rev1, diff_date1,
                                        1, 0);
-                   exists = xvers->vn_rcs && !RCS_isdead (xvers->srcfile,
-                                                          xvers->vn_rcs);
+                   exists = xvers->vn_rcs
+                            && !RCS_isdead (xvers->srcfile, xvers->vn_rcs);
                    freevers_ts (&xvers);
                }
                if (exists)
@@ -828,7 +827,7 @@
        /* The file was added locally.  */
        int exists = 0;
 
-       if (vers->srcfile != NULL)
+       if (vers->srcfile)
        {
            /* The file does exist in the repository.  */
 
@@ -838,12 +837,11 @@
                if (diff_rev1 && STREQ (diff_rev1, TAG_HEAD))
                {
                    char *head =
-                       (vers->vn_rcs == NULL
-                        ? NULL
-                        : RCS_branch_head (vers->srcfile, vers->vn_rcs));
+                       vers->vn_rcs
+                       ? RCS_branch_head (vers->srcfile, vers->vn_rcs)
+                       : NULL;
                    exists = head && !RCS_isdead (vers->srcfile, head);
-                   if (head != NULL)
-                       free (head);
+                   if (head) free (head);
                }
                else
                {
@@ -1072,7 +1070,7 @@
        return R_SKIP_ALL;
 
     if (!quiet)
-       error (0, 0, "Diffing %s", update_dir);
+       error (0, 0, "Diffing %s", NULL2DOT (update_dir));
     return R_PROCESS;
 }