# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1059453732 0
# Node ID 5d7063e137dad0f886e1b513c1c080fb260686ac
# Parent  dd2be7cd66df59c6426c8eafdeb259c8daedfc6e
[gaim-migrate @ 6822]
"3) fixes one prototype which was shadowing the index function from
strings.h."  --Zach Rusin

Eh.

committer: Tailor Script <tailor@pidgin.im>

diff -r dd2be7cd66df -r 5d7063e137da src/protocols/oscar/aim.h
--- a/src/protocols/oscar/aim.h	Tue Jul 29 04:27:31 2003 +0000
+++ b/src/protocols/oscar/aim.h	Tue Jul 29 04:42:12 2003 +0000
@@ -1438,9 +1438,9 @@
 faim_export int aimutil_putstr(char *, const char *, int);
 faim_export fu16_t aimutil_iconsum(const fu8_t *buf, int buflen);
 faim_export int aim_util_getlocalip(fu8_t *ip);
-faim_export int aimutil_tokslen(char *toSearch, int index, char dl);
+faim_export int aimutil_tokslen(char *toSearch, int theindex, char dl);
 faim_export int aimutil_itemcnt(char *toSearch, char dl);
-faim_export char *aimutil_itemindex(char *toSearch, int index, char dl);
+faim_export char *aimutil_itemindex(char *toSearch, int theindex, char dl);
 
 faim_export int aim_snlen(const char *sn);
 faim_export int aim_sncmp(const char *sn1, const char *sn2);
diff -r dd2be7cd66df -r 5d7063e137da src/protocols/oscar/util.c
--- a/src/protocols/oscar/util.c	Tue Jul 29 04:27:31 2003 +0000
+++ b/src/protocols/oscar/util.c	Tue Jul 29 04:42:12 2003 +0000
@@ -40,7 +40,7 @@
  *   -- DMP.
  *
  */
-faim_export int aimutil_tokslen(char *toSearch, int index, char dl)
+faim_export int aimutil_tokslen(char *toSearch, int theindex, char dl)
 {
 	int curCount = 1;
 	char *next;
@@ -50,13 +50,13 @@
 	last = toSearch;
 	next = strchr(toSearch, dl);
 
-	while(curCount < index && next != NULL) {
+	while(curCount < theindex && next != NULL) {
 		curCount++;
 		last = next + 1;
 		next = strchr(last, dl);
 	}
 
-	if ((curCount < index) || (next == NULL))
+	if ((curCount < theindex) || (next == NULL))
 		toReturn = strlen(toSearch) - (curCount - 1);
 	else
 		toReturn = next - toSearch - (curCount - 1);
@@ -81,7 +81,7 @@
 	return curCount;
 }
 
-faim_export char *aimutil_itemindex(char *toSearch, int index, char dl)
+faim_export char *aimutil_itemindex(char *toSearch, int theindex, char dl)
 {
 	int curCount;
 	char *next;
@@ -93,19 +93,19 @@
 	last = toSearch;
 	next = strchr(toSearch, dl);
 
-	while (curCount < index && next != NULL) {
+	while (curCount < theindex && next != NULL) {
 		curCount++;
 		last = next + 1;
 		next = strchr(last, dl);
 	}
 
-	if (curCount < index) {
+	if (curCount < theindex) {
 		toReturn = malloc(sizeof(char));
 		*toReturn = '\0';
 	}
 	next = strchr(last, dl);
 
-	if (curCount < index) {
+	if (curCount < theindex) {
 		toReturn = malloc(sizeof(char));
 		*toReturn = '\0';
 	} else {