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

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/29 18:16:16

Modified files:
        src            : ChangeLog client.c 

Log message:
        * client.c (is_cvsroot_level): Replace a conditional with an
        assertion.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3624&r2=1.3625
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.c?cvsroot=cvs&r1=1.480&r2=1.481

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3624
retrieving revision 1.3625
diff -u -b -r1.3624 -r1.3625
--- ChangeLog   29 Sep 2008 17:46:23 -0000      1.3624
+++ ChangeLog   29 Sep 2008 18:16:15 -0000      1.3625
@@ -1,5 +1,8 @@
 2008-09-29  Derek R. Price  <address@hidden>
 
+       * client.c (is_cvsroot_level): Replace a conditional with an
+       assertion.
+
        * log.c (rlog_proc): Avoid adding trailing /. to repository.  Some
        cleanup.
        * recurse.c (repository, struct recursion_frame, start_recursion):

Index: client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.c,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -b -r1.480 -r1.481
--- client.c    29 Sep 2008 16:06:45 -0000      1.480
+++ client.c    29 Sep 2008 18:16:16 -0000      1.481
@@ -2812,12 +2812,11 @@
     if (!STREQ (toplevel_repos, current_parsed_root->directory))
        return false;
 
-    /* An empty (relative) repository, or one trailing ./, specifies the top
-     * level.
-     */
-    return !*pathname
-          /* or PATHNAME == "./" */
-          || pathname[0] == '.' && ISSLASH (pathname[1]) && !pathname[2];
+    /* A "./" should no longer be possible.  */
+    assert (pathname[0] != '.' || !ISSLASH (pathname[1]) || pathname[2]);
+
+    /* An empty (relative) repository specifies the top level.  */
+    return !*pathname;
 }