moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed some extraneous carriage return characters

This commit is contained in:
Dan Fandrich 2009-09-28 18:13:35 +00:00
parent 5b11e3883c
commit 78d07cb0f9
2 changed files with 108 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
lib/curl_memrchr.c
View File

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

90
lib/curl_memrchr.h
View File

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