Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=29180338f130467ac57a3831b69e3008e564a140
commit 29180338f130467ac57a3831b69e3008e564a140
Author: crazy <[EMAIL PROTECTED]>
Date: Sat Aug 2 21:18:41 2008 +0200
Fix -Wshadow -Werror build with glibc-2.8
The 'index' variable is a problem, rename it.
diff --git a/src/versort/versort.c b/src/versort/versort.c
index 5923b75..3bdcce0 100644
--- a/src/versort/versort.c
+++ b/src/versort/versort.c
@@ -47,7 +47,7 @@ static char *buffer = NULL;
static size_t buffer_nmemb = 0;
static size_t buffer_size = 0;
-static char **index = NULL;
+static char **ver_index = NULL;
static size_t index_nmemb = 0;
static size_t index_size = 0;
@@ -102,15 +102,15 @@ static void makeindex()
{
if (tmp_index == index_size) {
index_size += BUFFER_CHUNK;
- index = realloc(index, index_size * sizeof(char
*));
- if (!index)
+ ver_index = realloc(ver_index, index_size *
sizeof(char *));
+ if (!ver_index)
exit(EXIT_FAILURE);
}
switch (status)
{
case STATUS_MARK: // Mark a new buffer
- index[index_nmemb] = &buffer[tmp_index];
+ ver_index[index_nmemb] = &buffer[tmp_index];
++index_nmemb;
status = STATUS_SEARCH;
break;
@@ -136,7 +136,7 @@ static void printindex()
size_t i;
for (i = 0; i < index_nmemb; i++)
- puts(index[i]);
+ puts(ver_index[i]);
}
static int vercmpp(const void *p1, const void *p2)
@@ -167,11 +167,11 @@ int main(int argc, char *argv[])
makeindex();
- qsort(index, index_nmemb, sizeof(char *), vercmpp);
+ qsort(ver_index, index_nmemb, sizeof(char *), vercmpp);
printindex();
- free(index);
+ free(ver_index);
free(buffer);
exit(EXIT_SUCCESS);
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git