diff options
| author | Rob Landley <rob@landley.net> | 2006-05-26 23:44:51 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-05-26 23:44:51 +0000 |
| commit | 8bb50782a5f0dd955a6fe18d381eb9322d1447e7 (patch) | |
| tree | b717c772c6fef53c34b723341a8c5b12ccb57902 /archival/dpkg.c | |
| parent | 5edc10275ec86f6ce6af97a8e2e5eeccb3a2e8cb (diff) | |
| download | busybox-8bb50782a5f0dd955a6fe18d381eb9322d1447e7.tar.gz | |
Change llist_add_* to take the address of the list rather than returning the new
head, and change all the callers.
Diffstat (limited to 'archival/dpkg.c')
| -rw-r--r-- | archival/dpkg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c index 3621db41d..2895f4f38 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c @@ -1484,10 +1484,10 @@ static void init_archive_deb_control(archive_handle_t *ar_handle) /* We don't care about data.tar.* or debian-binary, just control.tar.* */ #ifdef CONFIG_FEATURE_DEB_TAR_GZ - ar_handle->accept = llist_add_to(NULL, "control.tar.gz"); + llist_add_to(&(ar_handle->accept), "control.tar.gz"); #endif #ifdef CONFIG_FEATURE_DEB_TAR_BZ2 - ar_handle->accept = llist_add_to(ar_handle->accept, "control.tar.bz2"); + llist_add_to(&(ar_handle->accept), "control.tar.bz2"); #endif /* Assign the tar handle as a subarchive of the ar handle */ @@ -1506,10 +1506,10 @@ static void init_archive_deb_data(archive_handle_t *ar_handle) /* We don't care about control.tar.* or debian-binary, just data.tar.* */ #ifdef CONFIG_FEATURE_DEB_TAR_GZ - ar_handle->accept = llist_add_to(NULL, "data.tar.gz"); + llist_add_to(&(ar_handle->accept), "data.tar.gz"); #endif #ifdef CONFIG_FEATURE_DEB_TAR_BZ2 - ar_handle->accept = llist_add_to(ar_handle->accept, "data.tar.bz2"); + llist_add_to(&(ar_handle->accept), "data.tar.bz2"); #endif /* Assign the tar handle as a subarchive of the ar handle */ @@ -1575,7 +1575,7 @@ static void unpack_package(deb_file_t *deb_file) while(all_control_files[i]) { char *c = (char *) xmalloc(3 + strlen(all_control_files[i])); sprintf(c, "./%s", all_control_files[i]); - accept_list= llist_add_to(accept_list, c); + llist_add_to(&accept_list, c); i++; } archive_handle->sub_archive->accept = accept_list; @@ -1705,7 +1705,7 @@ int dpkg_main(int argc, char **argv) llist_t *control_list = NULL; /* Extract the control file */ - control_list = llist_add_to(NULL, "./control"); + llist_add_to(&control_list, "./control"); archive_handle = init_archive_deb_ar(argv[optind]); init_archive_deb_control(archive_handle); deb_file[deb_count]->control_file = deb_extract_control_file_to_buffer(archive_handle, control_list); |