[svn] Return a pointer from url_skip_credentials.

diff --git a/src/ChangeLog b/src/ChangeLog
index f5588fbc7e42f0731fd7cd3c67cf6f3d2fc11948..5e8fd1131d2824ddb9d6d9fd50a1f6b0431a5468 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-14  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * url.c (url_skip_credentials): Return a pointer directly.
+
 2003-12-14  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * url.c (url_file_name): Ditto.

diff --git a/src/url.c b/src/url.c
index 8baa9869483ee344ecfc4fe9936f0644fb7157d3..cc4c3f90bfafe77940776e8f153c8e51f8590adb 100644 (file)
--- a/src/url.c
+++ b/src/url.c
@@ -483,15 +483,15 @@ scheme_disable (enum url_scheme scheme)
 
    If no username and password are found, return 0.  */
 
-static int
+static const char *
 url_skip_credentials (const char *url)
 {
   /* Look for '@' that comes before terminators, such as '/', '?',
      '#', or ';'.  */
   const char *p = (const char *)strpbrk (url, "@/?#;");
   if (!p || *p != '@')
-    return 0;
-  return p + 1 - url;
+    return p;
+  return p + 1;
 }
 
 /* Parse credentials contained in [BEG, END).  The region is expected
@@ -840,7 +840,7 @@ url_parse (const char *url, int *error)
 
   p += strlen (supported_schemes[scheme].leading_string);
   uname_b = p;
-  p += url_skip_credentials (p);
+  p = url_skip_credentials (p);
   uname_e = p;
 
   /* scheme://user:pass@host[:port]... */