[Cvs-cvs] Changes to ccvs/src/root.c [cvs1-11-x-branch]

[Larry Jones]

Index: ccvs/src/root.c
diff -u ccvs/src/root.c:1.60.2.14 ccvs/src/root.c:1.60.2.15
--- ccvs/src/root.c:1.60.2.14   Wed Mar 16 22:00:45 2005
+++ ccvs/src/root.c     Fri Sep  2 19:37:35 2005
@@ -112,11 +112,7 @@
        goto out;
     }
 
-    if (
-#ifdef CLIENT_SUPPORT
-        !ret->isremote &&
-#endif
-        !isdir (ret->directory))
+    if (!ret->isremote && !isdir (ret->directory))
     {
        error (0, 0, "in directory %s:", xupdate_dir);
        error (0, 0,
@@ -294,6 +290,7 @@
 
     newroot->original = NULL;
     newroot->method = null_method;
+    newroot->isremote = 0;
 #ifdef CLIENT_SUPPORT
     newroot->username = NULL;
     newroot->password = NULL;
@@ -302,7 +299,6 @@
     newroot->directory = NULL;
     newroot->proxy_hostname = NULL;
     newroot->proxy_port = 0;
-    newroot->isremote = 0;
 #endif /* CLIENT_SUPPORT */
 
     return newroot;
@@ -414,7 +410,7 @@
         * We don't handle these, but we like to try and warn the user that
         * they are being ignored.
         */
-       if (p = strchr (method, ';'))   
+       if ((p = strchr (method, ';')) != NULL)
        {
            *p++ = '\0';
            if (!really_quiet)
@@ -460,10 +456,7 @@
                          : local_method);
     }
 
-#ifdef CLIENT_SUPPORT
     newroot->isremote = (newroot->method != local_method);
-#endif /* CLIENT_SUPPORT */
-
 
     if ((newroot->method != local_method)
        && (newroot->method != fork_method))