[svn] Made strpbrk_or_eos inline. Use strchr(s, '\0') for finding the NUL

char in the string.

diff --git a/src/ChangeLog b/src/ChangeLog
index 00ab3c938d6ef864bd13254807ae8a038c640201..b7ebd455679d04bfe6af55364f4dd06e3927b0e6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-07  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * url.c (strpbrk_or_eos): Made inline.  Use strchr(s, '\0') for
+       finding the NUL char position.
+
 2005-05-07  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * url.c (decide_copy_method): Renamed to char_needs_escaping.

diff --git a/src/url.c b/src/url.c
index 89e0d176843a992515f04d0098aa39910b4aec5b..fee88593ceb0f5405d7ed67613e1b28540ba991a 100644 (file)
--- a/src/url.c
+++ b/src/url.c
@@ -584,21 +584,21 @@ static void split_path PARAMS ((const char *, char **, char **));
 #define strpbrk_or_eos(s, accept) ({           \
   char *SOE_p = strpbrk (s, accept);           \
   if (!SOE_p)                                  \
-    SOE_p = (char *)s + strlen (s);            \
+    SOE_p = strchr (s, '\0');                  \
   SOE_p;                                       \
 })
 
 #else  /* not __GNUC__ */
 
-static char *
+static inline char *
 strpbrk_or_eos (const char *s, const char *accept)
 {
   char *p = strpbrk (s, accept);
   if (!p)
-    p = (char *)s + strlen (s);
+    p = strchr (s, '\0');
   return p;
 }
-#endif
+#endif /* not __GNUC__ */
 
 /* Turn STR into lowercase; return non-zero if a character was
    actually changed. */