The following commit has been merged in the master branch:
commit 19e33c332f2d072792c198aedc7932a6af3f7fd9
Author: Guillem Jover <[email protected]>
Date: Sat Nov 7 15:05:35 2009 +0100
libdpkg: Make desc argument const in compress_cat and decompress_cat
diff --git a/lib/dpkg/compression.c b/lib/dpkg/compression.c
index 827b2a3..b3c8364 100644
--- a/lib/dpkg/compression.c
+++ b/lib/dpkg/compression.c
@@ -35,7 +35,10 @@ fd_fd_filter(int fd_in, int fd_out,
ohshite(_("%s: failed to exec '%s %s'"), desc, cmd, args);
}
-void decompress_cat(enum compress_type type, int fd_in, int fd_out, char
*desc, ...) {
+void
+decompress_cat(enum compress_type type, int fd_in, int fd_out,
+ const char *desc, ...)
+{
va_list al;
struct varbuf v = VARBUF_INIT;
@@ -100,7 +103,10 @@ void decompress_cat(enum compress_type type, int fd_in,
int fd_out, char *desc,
}
}
-void compress_cat(enum compress_type type, int fd_in, int fd_out, const char
*compression, char *desc, ...) {
+void
+compress_cat(enum compress_type type, int fd_in, int fd_out,
+ const char *compression, const char *desc, ...)
+{
va_list al;
struct varbuf v = VARBUF_INIT;
char combuf[6];
diff --git a/lib/dpkg/dpkg.h b/lib/dpkg/dpkg.h
index 099af1a..d44cd7d 100644
--- a/lib/dpkg/dpkg.h
+++ b/lib/dpkg/dpkg.h
@@ -223,9 +223,9 @@ enum compress_type {
};
void decompress_cat(enum compress_type type, int fd_in, int fd_out,
- char *desc, ...) DPKG_ATTR_NORET DPKG_ATTR_PRINTF(4);
+ const char *desc, ...) DPKG_ATTR_NORET DPKG_ATTR_PRINTF(4);
void compress_cat(enum compress_type type, int fd_in, int fd_out,
- const char *compression, char *desc, ...)
+ const char *compression, const char *desc, ...)
DPKG_ATTR_NORET DPKG_ATTR_PRINTF(5);
DPKG_END_DECLS
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
