Removed some extraneous carriage return characters

diff --git a/lib/curl_memrchr.c b/lib/curl_memrchr.c
index 7ba16f3bcab5264213527a79650c8a77498e0341..049cd2c79e4938d0772da12cfb2e337883e3bcf7 100644 (file)
--- a/lib/curl_memrchr.c
+++ b/lib/curl_memrchr.c
@@ -1,63 +1,63 @@
-/***************************************************************************\r
- *                                  _   _ ____  _\r
- *  Project                     ___| | | |  _ \| |\r
- *                             / __| | | | |_) | |\r
- *                            | (__| |_| |  _ <| |___\r
- *                             \___|\___/|_| \_\_____|\r
- *\r
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.\r
- *\r
- * This software is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution. The terms\r
- * are also available at http://curl.haxx.se/docs/copyright.html.\r
- *\r
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell\r
- * copies of the Software, and permit persons to whom the Software is\r
- * furnished to do so, under the terms of the COPYING file.\r
- *\r
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY\r
- * KIND, either express or implied.\r
- *\r
- * $Id$\r
- ***************************************************************************/\r
-\r
-#include "setup.h"\r
-\r
-#include "curl_memrchr.h"\r
-\r
-#define _MPRINTF_REPLACE /* use our functions only */\r
-#include <curl/mprintf.h>\r
-\r
-#include "curl_memory.h"\r
-/* The last #include file should be: */\r
-#include "memdebug.h"\r
-\r
-#ifndef HAVE_MEMRCHR\r
-\r
-/*\r
- * Curl_memrchr()\r
- *\r
- * Our memrchr() function clone for systems which lack this function. The\r
- * memrchr() function is like the memchr() function, except that it searches\r
- * backwards from the end of the n bytes pointed to by s instead of forward\r
- * from the beginning.\r
- */\r
-\r
-void *\r
-Curl_memrchr(const void *s, int c, size_t n)\r
-{\r
-  const unsigned char *p = s;\r
-  const unsigned char *q = s;\r
-\r
-  p += n - 1;\r
-\r
-  while (p >= q) {\r
-    if (*p == (unsigned char)c)\r
-      return (void *)p;\r
-    p--;\r
-  }\r
-\r
-  return NULL;\r
-}\r
-\r
-#endif /* HAVE_MEMRCHR */\r
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * 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
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id$
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include "curl_memrchr.h"
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+#include "curl_memory.h"
+/* The last #include file should be: */
+#include "memdebug.h"
+
+#ifndef HAVE_MEMRCHR
+
+/*
+ * Curl_memrchr()
+ *
+ * Our memrchr() function clone for systems which lack this function. The
+ * memrchr() function is like the memchr() function, except that it searches
+ * backwards from the end of the n bytes pointed to by s instead of forward
+ * from the beginning.
+ */
+
+void *
+Curl_memrchr(const void *s, int c, size_t n)
+{
+  const unsigned char *p = s;
+  const unsigned char *q = s;
+
+  p += n - 1;
+
+  while (p >= q) {
+    if (*p == (unsigned char)c)
+      return (void *)p;
+    p--;
+  }
+
+  return NULL;
+}
+
+#endif /* HAVE_MEMRCHR */

diff --git a/lib/curl_memrchr.h b/lib/curl_memrchr.h
index 2096b6e8b7596bd0af9507f85bf140d80eced28a..86eb71124f1f09b00ee4067af90f2297a139e482 100644 (file)
--- a/lib/curl_memrchr.h
+++ b/lib/curl_memrchr.h
@@ -1,45 +1,45 @@
-#ifndef HEADER_CURL_MEMRCHR_H\r
-#define HEADER_CURL_MEMRCHR_H\r
-/***************************************************************************\r
- *                                  _   _ ____  _\r
- *  Project                     ___| | | |  _ \| |\r
- *                             / __| | | | |_) | |\r
- *                            | (__| |_| |  _ <| |___\r
- *                             \___|\___/|_| \_\_____|\r
- *\r
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.\r
- *\r
- * This software is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution. The terms\r
- * are also available at http://curl.haxx.se/docs/copyright.html.\r
- *\r
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell\r
- * copies of the Software, and permit persons to whom the Software is\r
- * furnished to do so, under the terms of the COPYING file.\r
- *\r
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY\r
- * KIND, either express or implied.\r
- *\r
- * $Id$\r
- ***************************************************************************/\r
-\r
-#include "setup.h"\r
-\r
-#ifdef HAVE_MEMRCHR\r
-\r
-#ifdef HAVE_STRING_H\r
-#  include <string.h>\r
-#endif\r
-#ifdef HAVE_STRINGS_H\r
-#  include <strings.h>\r
-#endif\r
-\r
-#else /* HAVE_MEMRCHR */\r
-\r
-void *Curl_memrchr(const void *s, int c, size_t n);\r
-\r
-#define memrchr(x,y,z) Curl_memrchr((x),(y),(z))\r
-\r
-#endif /* HAVE_MEMRCHR */\r
-\r
-#endif /* HEADER_CURL_MEMRCHR_H */\r
+#ifndef HEADER_CURL_MEMRCHR_H
+#define HEADER_CURL_MEMRCHR_H
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * 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
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id$
+ ***************************************************************************/
+
+#include "setup.h"
+
+#ifdef HAVE_MEMRCHR
+
+#ifdef HAVE_STRING_H
+#  include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#  include <strings.h>
+#endif
+
+#else /* HAVE_MEMRCHR */
+
+void *Curl_memrchr(const void *s, int c, size_t n);
+
+#define memrchr(x,y,z) Curl_memrchr((x),(y),(z))
+
+#endif /* HAVE_MEMRCHR */
+
+#endif /* HEADER_CURL_MEMRCHR_H */