[Cvs-cvs] ccvs/src ChangeLog hash.c watch.c

[Derek Robert Price]

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

Modified files:
        src            : ChangeLog hash.c watch.c 

Log message:
        * watch.c: Some cleanup.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3595&r2=1.3596
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/hash.c?cvsroot=cvs&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/watch.c?cvsroot=cvs&r1=1.50&r2=1.51

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3595
retrieving revision 1.3596
diff -u -b -r1.3595 -r1.3596
--- ChangeLog   17 Sep 2008 16:29:23 -0000      1.3595
+++ ChangeLog   17 Sep 2008 17:13:51 -0000      1.3596
@@ -1,5 +1,7 @@
 2008-09-17  Derek R. Price  <address@hidden>
 
+       * watch.c: Some cleanup.
+
        * fileattr.c: Some cleanup.
        (fileattr_set): New assertion on global.
 

Index: hash.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/hash.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- hash.c      28 Oct 2007 18:29:54 -0000      1.53
+++ hash.c      17 Sep 2008 17:13:52 -0000      1.54
@@ -359,13 +359,13 @@
 {
     Node *head, *p;
 
-    if ((list == NULL))
-       return NULL;
+    assert (key);
 
-    assert (key != NULL);
+    if (list_isempty (list))
+       return NULL;
 
     head = list->hasharray[hashp (key)];
-    if (head == NULL)
+    if (!head)
        /* Not found.  */
        return NULL;
 
@@ -385,16 +385,16 @@
 {
     Node *head, *p;
 
+    assert (key);
+
     /* This probably should be "assert (list != NULL)" (or if not we
        should document the current behavior), but only if we check all
        the callers to see if any are relying on this behavior.  */
-    if (list == NULL)
+    if (list_isempty(list))
        return NULL;
 
-    assert (key != NULL);
-
     head = list->hasharray[hashp (key)];
-    if (head == NULL)
+    if (!head)
        return NULL;
 
     for (p = head->hashnext; p != head; p = p->hashnext)

Index: watch.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/watch.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- watch.c     12 Sep 2007 18:27:08 -0000      1.50
+++ watch.c     17 Sep 2008 17:13:52 -0000      1.51
@@ -241,8 +241,7 @@
        free (mynewattr);
 }
 
-static int addremove_fileproc (void *callerdat,
-                                     struct file_info *finfo);
+
 
 static int
 addremove_fileproc (void *callerdat, struct file_info *finfo)
@@ -251,8 +250,11 @@
     return 0;
 }
 
-static int addremove_filesdoneproc (void * callerdat, int err, const char * 
repository,
-                                           const char *update_dir, List * 
entries)
+
+
+static int
+addremove_filesdoneproc (void *callerdat, int err, const char *repository,
+                        const char *update_dir, List *entries)
 {
     int set_default = the_args.setting_default;
     int dir_check = 0;