From b6aae0f38194cd39960a898606ee65d4be93a895 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 29 Jan 2007 22:51:25 +0000 Subject: preparatory patch for -Wwrite-strings #2 --- archival/dpkg.c | 12 ++++++------ archival/dpkg_deb.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'archival') diff --git a/archival/dpkg.c b/archival/dpkg.c index 5535c15a1..126138f80 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c @@ -1417,10 +1417,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 - llist_add_to(&(ar_handle->accept), "control.tar.gz"); + llist_add_to(&(ar_handle->accept), (char*)"control.tar.gz"); #endif #ifdef CONFIG_FEATURE_DEB_TAR_BZ2 - llist_add_to(&(ar_handle->accept), "control.tar.bz2"); + llist_add_to(&(ar_handle->accept), (char*)"control.tar.bz2"); #endif /* Assign the tar handle as a subarchive of the ar handle */ @@ -1439,10 +1439,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 - llist_add_to(&(ar_handle->accept), "data.tar.gz"); + llist_add_to(&(ar_handle->accept), (char*)"data.tar.gz"); #endif #ifdef CONFIG_FEATURE_DEB_TAR_BZ2 - llist_add_to(&(ar_handle->accept), "data.tar.bz2"); + llist_add_to(&(ar_handle->accept), (char*)"data.tar.bz2"); #endif /* Assign the tar handle as a subarchive of the ar handle */ @@ -1525,7 +1525,7 @@ static void unpack_package(deb_file_t *deb_file) archive_handle = init_archive_deb_ar(deb_file->filename); init_archive_deb_data(archive_handle); archive_handle->sub_archive->action_data = data_extract_all_prefix; - archive_handle->sub_archive->buffer = "/"; + archive_handle->sub_archive->buffer = (char*)"/"; /* huh? */ archive_handle->sub_archive->flags |= ARCHIVE_EXTRACT_UNCONDITIONAL; unpack_ar_archive(archive_handle); @@ -1629,7 +1629,7 @@ int dpkg_main(int argc, char **argv) llist_t *control_list = NULL; /* Extract the control file */ - llist_add_to(&control_list, "./control"); + llist_add_to(&control_list, (char*)"./control"); archive_handle = init_archive_deb_ar(argv[0]); init_archive_deb_control(archive_handle); deb_file[deb_count]->control_file = deb_extract_control_file_to_buffer(archive_handle, control_list); diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c index d11d9df17..c9b8a0429 100644 --- a/archival/dpkg_deb.c +++ b/archival/dpkg_deb.c @@ -19,7 +19,7 @@ int dpkg_deb_main(int argc, char **argv) archive_handle_t *tar_archive; llist_t *control_tar_llist = NULL; unsigned opt; - char *extract_dir = NULL; + const char *extract_dir = NULL; short argcount = 1; /* Setup the tar archive handle */ @@ -31,13 +31,13 @@ int dpkg_deb_main(int argc, char **argv) ar_archive->filter = filter_accept_list_reassign; #ifdef CONFIG_FEATURE_DEB_TAR_GZ - llist_add_to(&(ar_archive->accept), "data.tar.gz"); - llist_add_to(&control_tar_llist, "control.tar.gz"); + llist_add_to(&(ar_archive->accept), (char*)"data.tar.gz"); + llist_add_to(&control_tar_llist, (char*)"control.tar.gz"); #endif #ifdef CONFIG_FEATURE_DEB_TAR_BZ2 - llist_add_to(&(ar_archive->accept), "data.tar.bz2"); - llist_add_to(&control_tar_llist, "control.tar.bz2"); + llist_add_to(&(ar_archive->accept), (char*)"data.tar.bz2"); + llist_add_to(&control_tar_llist, (char*)"control.tar.bz2"); #endif opt_complementary = "?c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX"; @@ -60,7 +60,7 @@ int dpkg_deb_main(int argc, char **argv) * it should accept a second argument which specifies a * specific field to print */ ar_archive->accept = control_tar_llist; - llist_add_to(&(tar_archive->accept), "./control"); + llist_add_to(&(tar_archive->accept), (char*)"./control"); tar_archive->filter = filter_accept_list; tar_archive->action_data = data_extract_to_stdout; } -- cgit v1.2.3