From af213891f912e7a5d726120b373d1f453ca50f5e Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 20 May 2009 04:25:45 +0000 Subject: [PATCH] (trunk libT) make tr_memmem() more readable --- libtransmission/utils.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libtransmission/utils.c b/libtransmission/utils.c index d83db8e2b..2cf60b764 100644 --- a/libtransmission/utils.c +++ b/libtransmission/utils.c @@ -688,20 +688,20 @@ tr_strndup( const void * in, int len ) } const char* -tr_memmem( const char * s1, size_t l1, /* haystack */ - const char * s2, size_t l2 ) /* needle */ +tr_memmem( const char * haystack, size_t haystacklen, + const char * needle, size_t needlelen ) { #ifdef HAVE_MEMMEM - return memmem( s1, l1, s2, l2 ); + return memmem( haystack, haystacklen, needle, needlelen ); #else - if( !l2 ) return s1; - while( l1 >= l2 ) - { - l1--; - if( !memcmp( s1, s2, l2 ) ) - return s1; - s1++; - } + const char *h = haystack; + const char *n = needle; + size_t i; + + for( i=0; i