[axel-commits] r116 - in /trunk: ROADMAP search.c

[phihag-guest at users.alioth.debian.org]

Author: phihag-guest
Date: Wed Jan  6 12:06:08 2010
New Revision: 116

URL: http://svn.debian.org/wsvn/axel/?sc=1&rev=116
Log:
Rename search.c/strrstr to avoid collisions

Modified:
    trunk/ROADMAP
    trunk/search.c

Modified: trunk/ROADMAP
URL: http://svn.debian.org/wsvn/axel/trunk/ROADMAP?rev=116&op=diff
==============================================================================
--- trunk/ROADMAP (original)
+++ trunk/ROADMAP Wed Jan  6 12:06:08 2010
@@ -1,3 +1,9 @@
+Roadmap for Axel v2
+===================
+
+* replace old gettext with new one
+* Check if strrstr is provided by environment
+
 Roadmap for Axel v3
 ===================
 

Modified: trunk/search.c
URL: http://svn.debian.org/wsvn/axel/trunk/search.c?rev=116&op=diff
==============================================================================
--- trunk/search.c (original)
+++ trunk/search.c Wed Jan  6 12:06:08 2010
@@ -25,7 +25,7 @@
 
 #include "axel.h"
 
-static char *strrstr( char *haystack, char *needle );
+static char *axel_strrstr( char *haystack, char *needle );
 static void *search_speedtest( void *r );
 static int search_sortlist_qsort( const void *a, const void *b );
 
@@ -136,7 +136,7 @@
 	for( i = 1; strncmp( s1, "</pre>", 6 ) && i < results->conf->search_amount && *s1; i ++ )
 	{
 		s3 = strchr( s1, '\n' ); *s3 = 0;
-		s2 = strrstr( s1, "<a href=" ) + 8;
+		s2 = axel_strrstr( s1, "<a href=" ) + 8;
 		*s3 = '\n';
 		s3 = strchr( s2, ' ' ); *s3 = 0;
 		if( strcmp( results[0].url, s2 ) )
@@ -257,7 +257,7 @@
 	return( NULL );
 }
 
-char *strrstr( char *haystack, char *needle )
+char *axel_strrstr( char *haystack, char *needle )
 {
 	int i, j;