summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorRobey Pointer <robey@src.gnome.org>2000-10-24 02:38:09 +0000
committerRobey Pointer <robey@src.gnome.org>2000-10-24 02:38:09 +0000
commit399bde65ff7b71fc1cd334356d3bb1730f9d86eb (patch)
tree0b01e449b3b19ce7fccb6b1c4be29b2c2bcbf6cc /components
parentec77b30ed5795a73db318605a5daaadb5decf64f (diff)
downloadnautilus-399bde65ff7b71fc1cd334356d3bb1730f9d86eb.tar.gz
Fix a few warnings that show up on older rpmlibs.
* components/services/install/lib/eazel-install-types.c: (packagedata_fill_from_rpm_header): Fix a few warnings that show up on older rpmlibs.
Diffstat (limited to 'components')
-rw-r--r--components/services/install/lib/eazel-install-types.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/components/services/install/lib/eazel-install-types.c b/components/services/install/lib/eazel-install-types.c
index 1844b460c..c7e9d09a3 100644
--- a/components/services/install/lib/eazel-install-types.c
+++ b/components/services/install/lib/eazel-install-types.c
@@ -355,8 +355,6 @@ packagedata_fill_from_rpm_header (PackageData *pack,
int index;
int num_paths;
- num_paths = 0;
-
/* RPM v.3.0.4 and above has RPMTAG_BASENAMES,
Lets see if RPMTAG_PROVIDES works for the older ones */
#ifdef RPMTAG_BASENAMES
@@ -390,10 +388,8 @@ packagedata_fill_from_rpm_header (PackageData *pack,
complexity, aka O(nē) */
for (index=0; index<count; index++) {
char *fullname;
- int index2;
+ int index2 = 0;
- index2 = 0;
-
if (paths) {
fullname = g_strdup_printf ("%s/%s", paths_copy[indexes[index]], names[index]);
} else {
@@ -415,9 +411,11 @@ packagedata_fill_from_rpm_header (PackageData *pack,
pack->provides = g_list_prepend (pack->provides, fullname);
}
}
+#ifdef RPMTAG_BASENAMES
for (index=0; index<num_paths; index++) {
g_free (paths_copy[index]);
}
+#endif /* RPMTAG_BASENAMES */
g_free (paths_copy);
}