The following commit has been merged in the master branch:
commit b61d3f48bb1d991da4da596c33d8b8b3454401d1
Author: Guillem Jover <[email protected]>
Date: Mon Feb 8 15:26:00 2010 +0100
libdpkg: Do not shadow global compressor variable
Rename compressor to compressor_array, as a side effect it makes the
variable name more clear.
diff --git a/lib/dpkg/compress.c b/lib/dpkg/compress.c
index e20ee21..c58f1db 100644
--- a/lib/dpkg/compress.c
+++ b/lib/dpkg/compress.c
@@ -352,7 +352,7 @@ struct compressor compressor_lzma = {
* Generic compressor filter.
*/
-static struct compressor *compressor[] = {
+static struct compressor *compressor_array[] = {
&compressor_none,
&compressor_gzip,
&compressor_bzip2,
@@ -364,9 +364,9 @@ compressor_find_by_name(const char *name)
{
size_t i;
- for (i = 0; i < array_count(compressor); i++)
- if (strcmp(compressor[i]->name, name) == 0)
- return compressor[i];
+ for (i = 0; i < array_count(compressor_array); i++)
+ if (strcmp(compressor_array[i]->name, name) == 0)
+ return compressor_array[i];
return NULL;
}
@@ -376,9 +376,9 @@ compressor_find_by_extension(const char *extension)
{
size_t i;
- for (i = 0; i < array_count(compressor); i++)
- if (strcmp(compressor[i]->extension, extension) == 0)
- return compressor[i];
+ for (i = 0; i < array_count(compressor_array); i++)
+ if (strcmp(compressor_array[i]->extension, extension) == 0)
+ return compressor_array[i];
return NULL;
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
