Moved Curl_strntoupper() to the rawstr.c file where the other raw string

functions are.

diff --git a/lib/rawstr.c b/lib/rawstr.c
index 795342338a9318222afde1ec1585e8e36aeac25e..25035b5b98bb824683a39ba571dab4ef7489e2f8 100644 (file)
--- a/lib/rawstr.c
+++ b/lib/rawstr.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -92,7 +92,8 @@ char Curl_raw_toupper(char in)
  * this.  See http://daniel.haxx.se/blog/2008/10/15/strcasecmp-in-turkish/ for
  * some further explanation to why this function is necessary.
  *
- * The function is capable of comparing a-z case insensitively even for non-ascii.
+ * The function is capable of comparing a-z case insensitively even for
+ * non-ascii.
  */
 
 int Curl_raw_equal(const char *first, const char *second)
@@ -126,3 +127,17 @@ int Curl_raw_nequal(const char *first, const char *second, size_t max)
   return Curl_raw_toupper(*first) == Curl_raw_toupper(*second);
 }
 
+/* Copy an upper case version of the string from src to dest.  The
+ * strings may overlap.  No more than n characters of the string are copied
+ * (including any NUL) and the destination string will NOT be
+ * NUL-terminated if that limit is reached.
+ */
+void Curl_strntoupper(char *dest, const char *src, size_t n)
+{
+  if (n < 1)
+    return;
+
+  do {
+    *dest++ = Curl_raw_toupper(*src);
+  } while (*src++ && --n);
+}

diff --git a/lib/rawstr.h b/lib/rawstr.h
index 46fb60929de0f64a727276ccdf95428b55c40a9f..ff30d3642389eff97b9af14d09af1d0e6b991caf 100644 (file)
--- a/lib/rawstr.h
+++ b/lib/rawstr.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -42,3 +42,4 @@ char Curl_raw_toupper(char in);
 #define checkprefix(a,b)    Curl_raw_nequal(a,b,strlen(a))
 
 #endif
+void Curl_strntoupper(char *dest, const char *src, size_t n);

diff --git a/lib/url.c b/lib/url.c
index 80d55bd55f29de4e231247ec1c29f8b210e2dbc6..6d5bf42072299362841b9233eb5157c515211891 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -230,21 +230,6 @@ void Curl_safefree(void *ptr)
     free(ptr);
 }
 
-/* Copy an upper case version of the string from src to dest.  The
- * strings may overlap.  No more than n characters of the string are copied
- * (including any NUL) and the destination string will NOT be
- * NUL-terminated if that limit is reached.
- */
-void Curl_strntoupper(char *dest, const char *src, size_t n)
-{
-  if (n < 1)
-    return;
-
-  do {
-    *dest++ = Curl_raw_toupper(*src);
-  } while (*src++ && --n);
-}
-
 static void close_connections(struct SessionHandle *data)
 {
   /* Loop through all open connections and kill them one by one */

diff --git a/lib/url.h b/lib/url.h
index 6cb0b7ec0d4be71e46dc8efa9bd03041643ea5f3..7e22b73974fb414fbff9a3272b967c20b8e00775 100644 (file)
--- a/lib/url.h
+++ b/lib/url.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -48,7 +48,6 @@ CURLcode Curl_protocol_connect(struct connectdata *conn, bool *done);
 CURLcode Curl_protocol_connecting(struct connectdata *conn, bool *done);
 CURLcode Curl_protocol_doing(struct connectdata *conn, bool *done);
 void Curl_safefree(void *ptr);
-void Curl_strntoupper(char *dest, const char *src, size_t n);
 
 /* create a connection cache */
 struct conncache *Curl_mk_connc(int type, long amount);