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

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/19 14:49:25

Modified files:
        src            : ChangeLog server.c 

Log message:
        * server.c (expand_proc): Some cleanup.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3600&r2=1.3601
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/server.c?cvsroot=cvs&r1=1.486&r2=1.487

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3600
retrieving revision 1.3601
diff -u -b -r1.3600 -r1.3601
--- ChangeLog   19 Sep 2008 00:48:05 -0000      1.3600
+++ ChangeLog   19 Sep 2008 14:49:23 -0000      1.3601
@@ -1,3 +1,7 @@
+2008-09-19  Derek R. Price  <address@hidden>
+
+       * server.c (expand_proc): Some cleanup.
+
 2008-09-18  Derek R. Price  <address@hidden>
 
        * lock.c: Some cleanup.

Index: server.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/server.c,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -b -r1.486 -r1.487
--- server.c    17 Sep 2008 19:53:31 -0000      1.486
+++ server.c    19 Sep 2008 14:49:25 -0000      1.487
@@ -5728,7 +5728,8 @@
 
 
 static int
-expand_proc (int argc, char **argv, char *where, char *mwhere, char *mfile, 
int shorten, int local_specified, char *omodule, char *msg)
+expand_proc (int argc, char **argv, char *where, char *mwhere, char *mfile,
+            int shorten, int local_specified, char *omodule, char *msg)
 {
     int i;
     char *dir = argv[0];
@@ -5739,16 +5740,16 @@
        mwhere will not be set, so send out the appropriate
        expansion. */
 
-    if (mwhere != NULL)
+    if (mwhere)
     {
        buf_output0 (buf_to_net, "Module-expansion ");
-       if (server_dir != NULL)
+       if (server_dir)
        {
            buf_output0 (buf_to_net, server_dir);
-           buf_output0 (buf_to_net, "/");
+           buf_append_char (buf_to_net, '/');
        }
        buf_output0 (buf_to_net, mwhere);
-       if (mfile != NULL)
+       if (mfile)
        {
            buf_append_char (buf_to_net, '/');
            buf_output0 (buf_to_net, mfile);
@@ -5762,10 +5763,10 @@
        if (argc == 1)
        {
            buf_output0 (buf_to_net, "Module-expansion ");
-           if (server_dir != NULL)
+           if (server_dir)
            {
                buf_output0 (buf_to_net, server_dir);
-               buf_output0 (buf_to_net, "/");
+               buf_append_char (buf_to_net, '/');
            }
            buf_output0 (buf_to_net, dir);
            buf_append_char (buf_to_net, '\n');
@@ -5775,10 +5776,10 @@
            for (i = 1; i < argc; ++i)
            {
                buf_output0 (buf_to_net, "Module-expansion ");
-               if (server_dir != NULL)
+               if (server_dir)
                {
                    buf_output0 (buf_to_net, server_dir);
-                   buf_output0 (buf_to_net, "/");
+                   buf_append_char (buf_to_net, '/');
                }
                buf_output0 (buf_to_net, dir);
                buf_append_char (buf_to_net, '/');