[Cvs-cvs] ccvs/src ChangeLog commit.c entries.c find_name...

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   07/12/20 16:09:26

Modified files:
        src            : ChangeLog commit.c entries.c find_names.c 
                         history.c ignore.c import.c lock.c login.c 
                         subr.c subr.h tag.c update.c 

Log message:
        * commit.c, entries.c, find_names.c, history.c, ignore.c, import.c,
        lock.c, login.c, subr.c, subr.h, tag.c, update.c: Fix gcc -Wall
        warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3551&r2=1.3552
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/commit.c?cvsroot=cvs&r1=1.278&r2=1.279
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/entries.c?cvsroot=cvs&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/find_names.c?cvsroot=cvs&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/history.c?cvsroot=cvs&r1=1.103&r2=1.104
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ignore.c?cvsroot=cvs&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/import.c?cvsroot=cvs&r1=1.188&r2=1.189
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/lock.c?cvsroot=cvs&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/login.c?cvsroot=cvs&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/subr.c?cvsroot=cvs&r1=1.162&r2=1.163
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/subr.h?cvsroot=cvs&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/tag.c?cvsroot=cvs&r1=1.154&r2=1.155
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/update.c?cvsroot=cvs&r1=1.276&r2=1.277

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3551
retrieving revision 1.3552
diff -u -b -r1.3551 -r1.3552
--- ChangeLog   17 Dec 2007 04:57:33 -0000      1.3551
+++ ChangeLog   20 Dec 2007 16:09:25 -0000      1.3552
@@ -1,3 +1,9 @@
+2007-12-20  Larry Jones  <address@hidden>
+
+       * commit.c, entries.c, find_names.c, history.c, ignore.c, import.c,
+       lock.c, login.c, subr.c, subr.h, tag.c, update.c: Fix gcc -Wall
+       warnings.
+
 2007-12-16  Larry Jones  <address@hidden>
 
        * rcs.c (HAVE_MMAP): Fall back to stdio if mmap fails.

Index: commit.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/commit.c,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -b -r1.278 -r1.279
--- commit.c    12 Sep 2007 19:14:27 -0000      1.278
+++ commit.c    20 Dec 2007 16:09:25 -0000      1.279
@@ -1011,7 +1011,7 @@
                xdir = ".";
            else
                xdir = finfo->update_dir;
-           if (p = findnode (mulist, xdir))
+           if ((p = findnode (mulist, xdir)) != NULL)
            {
                ulist = ((struct master_lists *) p->data)->ulist;
                cilist = ((struct master_lists *) p->data)->cilist;
@@ -1707,7 +1707,6 @@
 {
     Node *p;
     List *ulist;
-    char *real_repos;
 
     if (!isdir (dir))
        return R_SKIP_ALL;

Index: entries.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/entries.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- entries.c   12 Sep 2007 18:27:07 -0000      1.74
+++ entries.c   20 Dec 2007 16:09:25 -0000      1.75
@@ -662,7 +662,7 @@
     assert (update_dir_i);
     assert (dir);
 
-    TRACE (TRACE_FLOW, "Entries_Open_Dir (%s, %s)", update_dir, dir);
+    TRACE (TRACE_FLOW, "Entries_Open_Dir (%s, %s)", update_dir_i, dir);
 
     /* get a fresh list... */
     entries = getlist ();
@@ -692,7 +692,7 @@
     fpin = CVS_FOPEN (entfile, "r");
     if (fpin)
     {
-       while (ent = fgetentent (fpin, NULL, &sawdir)) 
+       while ((ent = fgetentent (fpin, NULL, &sawdir)) != NULL)
            AddEntryNode (entries, ent);
 
        if (fclose (fpin) < 0)

Index: find_names.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/find_names.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- find_names.c        12 Sep 2007 18:27:07 -0000      1.50
+++ find_names.c        20 Dec 2007 16:09:25 -0000      1.51
@@ -254,7 +254,7 @@
 
     /* read the dir, grabbing sub-dirs */
     errno = 0;
-    while (dp = CVS_READDIR (dirp))
+    while ((dp = CVS_READDIR (dirp)) != NULL)
     {
        if (STREQ (dp->d_name, ".")
            || STREQ (dp->d_name, "..")
@@ -295,7 +295,7 @@
        {
            /* blow off symbolic links to dirs in local dir */
            if (DIRENT_MUST_BE(dp, DT_LNK)
-               || DIRENT_MIGHT_BE_SYMLINK(dp) && islink(tmp))
+               || (DIRENT_MIGHT_BE_SYMLINK(dp) && islink(tmp)))
                goto do_it_again;
 
            /* check for new style */

Index: history.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/history.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- history.c   12 Sep 2007 18:27:07 -0000      1.103
+++ history.c   20 Dec 2007 16:09:25 -0000      1.104
@@ -809,7 +809,7 @@
 history_write (int type, const char *update_dir, const char *revs,
                const char *name, const char *repository)
 {
-    char *fname;
+    char *fname = NULL;
     char *workdir;
     char *username = getcaller ();
     int fd;
@@ -983,6 +983,7 @@
        error (1, errno, "cannot close history file: %s", fname);
     free (workdir);
  out:
+    if (fname)
     free (fname);
     clear_history_lock ();
 }

Index: ignore.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ignore.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- ignore.c    12 Sep 2007 18:27:07 -0000      1.62
+++ ignore.c    20 Dec 2007 16:09:25 -0000      1.63
@@ -445,11 +445,11 @@
            || lstat (file, &sb) != -1)
        {
            if (DIRENT_MUST_BE (dp, DT_LNK)
-               || DIRENT_MIGHT_BE_SYMLINK(dp) && S_ISLNK(sb.st_mode))
+               || (DIRENT_MIGHT_BE_SYMLINK(dp) && S_ISLNK(sb.st_mode)))
                /* Skip symlinks.  */
                continue;
            else if (DIRENT_MUST_BE (dp, DT_DIR)
-                    || DIRENT_MIGHT_BE_DIR (dp) && S_ISDIR (sb.st_mode))
+                    || (DIRENT_MIGHT_BE_DIR (dp) && S_ISDIR (sb.st_mode)))
            {
                if (!subdirs)
                {

Index: import.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/import.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- import.c    12 Sep 2007 17:27:22 -0000      1.188
+++ import.c    20 Dec 2007 16:09:25 -0000      1.189
@@ -199,7 +199,7 @@
      */
     /* for each "CVS" in path */
     cp = argv[0];
-    while ((cp = mbsstr (cp, "CVS")))
+    while ((cp = mbsstr (cp, "CVS")) != NULL)
     {
        if (/* /^CVS/ OR m#/CVS#... */
            (cp == argv[0] || ISSLASH (*(cp-1)))
@@ -490,7 +490,7 @@
     else
     {
        errno = 0;
-       while (dp = CVS_READDIR (dirp))
+       while ((dp = CVS_READDIR (dirp)) != NULL)
        {
            if (STREQ (dp->d_name, ".") || STREQ (dp->d_name, ".."))
                goto one_more_time_boys;
@@ -514,13 +514,13 @@
            }
 
            if (DIRENT_MUST_BE(dp, DT_LNK)
-                    || DIRENT_MIGHT_BE_SYMLINK(dp) && islink (dp->d_name))
+                    || (DIRENT_MIGHT_BE_SYMLINK(dp) && islink (dp->d_name)))
            {
                add_log ('L', dp->d_name);
                err++;
            }
            else if (DIRENT_MUST_BE(dp, DT_DIR)
-               || DIRENT_MIGHT_BE_DIR(dp) && isdir (dp->d_name))
+               || (DIRENT_MIGHT_BE_DIR(dp) && isdir (dp->d_name)))
            {
                Node *n;
 

Index: lock.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/lock.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- lock.c      12 Sep 2007 18:27:07 -0000      1.125
+++ lock.c      20 Dec 2007 16:09:25 -0000      1.126
@@ -179,7 +179,6 @@
 lock_name (const char *repository, const char *name)
 {
     char *retval;
-    const char *p;
     char *q;
     const char *short_repos;
     mode_t save_umask = 0000;

Index: login.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/login.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- login.c     12 Sep 2007 17:27:23 -0000      1.92
+++ login.c     20 Dec 2007 16:09:26 -0000      1.93
@@ -124,15 +124,18 @@
        unsigned long int entry_version = 0 /* Placate -Wall.  */;
 
        if (isspace(*(linebuf + 1)))
+       {
            /* special case since strtoul ignores leading white space */
            q = linebuf + 1;
+       }
        else
+       {
            entry_version = strtoul (linebuf + 1, &q, 10);
-
        if (q != linebuf + 1)
            /* assume a delimiting seperator */
            q++;
        /* else, no valid digits found by strtoul */
+       }
 
        switch (entry_version)
        {

Index: subr.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/subr.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -b -r1.162 -r1.163
--- subr.c      12 Sep 2007 18:27:08 -0000      1.162
+++ subr.c      20 Dec 2007 16:09:26 -0000      1.163
@@ -2230,7 +2230,7 @@
 cvs_mkdir_i (const char *name, mode_t mode,
             const char *update_dir, unsigned int flags)
 {
-    mode_t omask;
+    mode_t omask = 0;
     bool retval;
 
     if (noexec && !(flags & MD_FORCE)) return false;
@@ -2420,7 +2420,7 @@
     va_start (args, dir);
 
     retval = xstrdup (dir);
-    while (append = va_arg (args, const char *))
+    while ((append = va_arg (args, const char *)) != NULL)
     {
        char *new;
 

Index: subr.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/subr.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- subr.h      12 Sep 2007 18:27:08 -0000      1.16
+++ subr.h      20 Dec 2007 16:09:26 -0000      1.17
@@ -159,7 +159,7 @@
 static inline bool
 strneq (const char *a, const char *b, size_t n)
 {
-    return !n || *a == *b && strncmp (a, b, n) == 0;
+    return !n || (*a == *b && strncmp (a, b, n) == 0);
 }
 # define STREQ(a, b) streq ((a), (b))
 # define STRNEQ(a, b, n) strneq ((a), (b), (n))

Index: tag.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/tag.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- tag.c       28 Oct 2007 18:29:54 -0000      1.154
+++ tag.c       20 Dec 2007 16:09:26 -0000      1.155
@@ -469,7 +469,7 @@
            /* If the portion of the module is a path, put the dir part on
              * REPOS.
              */
-           if (cp = strrchr (mfile, '/'))
+           if ((cp = strrchr (mfile, '/')) != NULL)
            {
                *cp = '\0';
                strcat (repository, "/");

Index: update.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/update.c,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -b -r1.276 -r1.277
--- update.c    12 Sep 2007 18:27:08 -0000      1.276
+++ update.c    20 Dec 2007 16:09:26 -0000      1.277
@@ -1120,7 +1120,7 @@
        return 0;
     }
     errno = 0;
-    while (dp = CVS_READDIR (dirp))
+    while ((dp = CVS_READDIR (dirp)) != NULL)
     {
        if (!STREQ (dp->d_name, ".") && !STREQ (dp->d_name, ".."))
        {