[Cvs-cvs] ccvs/src ChangeLog rcs.c [newtags2]

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         newtags2
Changes by:     Mark D. Baushke <mdb>   07/11/10 21:40:25

Modified files:
        src            : ChangeLog rcs.c 

Log message:
        * rcs.c (RCS_getprevious): Fix warnings for non-gcc compilers.
        (RCS_getorigin): Ditto.
        (RCS_getroot): Ditto.
        (translate_tag): Ditto.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=newtags2&r1=1.3337.2.3&r2=1.3337.2.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/rcs.c?cvsroot=cvs&only_with_tag=newtags2&r1=1.357.2.2&r2=1.357.2.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3337.2.3
retrieving revision 1.3337.2.4
diff -u -b -r1.3337.2.3 -r1.3337.2.4
--- ChangeLog   10 Nov 2007 21:04:26 -0000      1.3337.2.3
+++ ChangeLog   10 Nov 2007 21:40:24 -0000      1.3337.2.4
@@ -1,5 +1,13 @@
 2007-11-10  Mark D. Baushke  <address@hidden>
 
+       * rcs.c (RCS_getprevious): Fix warnings for non-gcc compilers.
+       (RCS_getorigin): Ditto.
+       (RCS_getroot): Ditto.
+       (translate_tag): Ditto.
+       (Patch suggested by Larry Jones  <address@hidden>.)
+       
+2007-11-10  Mark D. Baushke  <address@hidden>
+
        * rcs.c (RCS_getdate): Remove unused local variables.
        (RCS_getprevious, RCS_getorigin, RCS_getroot): Silence gcc warning.
        (RCS_getorigin): Logic cleanup.

Index: rcs.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/rcs.c,v
retrieving revision 1.357.2.2
retrieving revision 1.357.2.3
diff -u -b -r1.357.2.2 -r1.357.2.3
--- rcs.c       10 Nov 2007 20:51:48 -0000      1.357.2.2
+++ rcs.c       10 Nov 2007 21:40:25 -0000      1.357.2.3
@@ -3385,7 +3385,7 @@
            Node *br;
            for (br = head->next; br != head; br = br->next)
            {
-                if ((node = findnode (rcs->versions, br->key)))
+                if ((node = findnode (rcs->versions, br->key)) != NULL)
                {
                    if (strncmp (((RCSVers *)node->data)->version, trev, len))
                        continue;
@@ -3468,7 +3468,7 @@
                    for (br = head->next; br != head; br = br->next)
                    {
                        Node *node = NULL;
-                       if ((node = findnode (rcs->versions, br->key)))
+                       if ((node = findnode (rcs->versions, br->key)) != NULL)
                        {
                            vers = node->data;
                            if (!vers->dead
@@ -3647,7 +3647,7 @@
                      if (!strncmp (tmp, br->key, len))
                      {
                          Node *bn = NULL;
-                         if ((bn = findnode (rcs->versions, br->key)))
+                         if ((bn = findnode (rcs->versions, br->key)) != NULL)
                          {
                              RCSVers *cv = bn->data;
                              if (cv->dead)
@@ -3774,7 +3774,7 @@
                     //check if br->key is on branch rev
                     if (!strncmp (rev, br->key, len))
                     {
-                        if ((node = findnode (rcs->versions, br->key)))
+                        if ((node = findnode (rcs->versions, br->key)) != NULL)
                         {
                            vers = node->data;
                             if (vers->dead && !RCS_datecmp (rootdate, 
vers->date))
@@ -4002,7 +4002,7 @@
                else if (STREQ (token, TAG_COMMITID))
                {
                    char *commitid = strtok (NULL,".");
-                   if ((token = strtok (NULL,".")))
+                   if ((token = strtok (NULL,".")) != NULL)
                        /* The next token needs to be evaluated here because
                         * RCS_getcommitid needs to know whether a previous
                         * revision is requested (performance enhancement).