The following commit has been merged in the master branch:
commit 230eecd402b7d7252cc958706db8d8350055e560
Author: Guillem Jover <[email protected]>
Date: Mon Mar 15 07:24:14 2010 +0100
libdpkg: Remove unused desc argument from buffer_read and buffer_write
diff --git a/lib/dpkg/buffer.c b/lib/dpkg/buffer.c
index ccd610c..b7e8624 100644
--- a/lib/dpkg/buffer.c
+++ b/lib/dpkg/buffer.c
@@ -95,8 +95,7 @@ buffer_done(struct buffer_data *read_data, struct buffer_data
*write_data)
}
off_t
-buffer_write(struct buffer_data *data, const void *buf, off_t length,
- const char *desc)
+buffer_write(struct buffer_data *data, const void *buf, off_t length)
{
off_t ret = length;
@@ -132,8 +131,7 @@ buffer_write(struct buffer_data *data, const void *buf,
off_t length,
}
off_t
-buffer_read(struct buffer_data *data, void *buf, off_t length,
- const char *desc)
+buffer_read(struct buffer_data *data, void *buf, off_t length)
{
off_t ret;
@@ -197,7 +195,7 @@ buffer_hash(const void *input, void *output, int type,
off_t limit)
off_t ret;
buffer_init(NULL, &data);
- ret = buffer_write(&data, input, limit, NULL);
+ ret = buffer_write(&data, input, limit);
buffer_done(NULL, &data);
return ret;
@@ -220,7 +218,7 @@ buffer_copy(struct buffer_data *read_data, struct
buffer_data *write_data,
buf = m_malloc(bufsize);
while (bytesread >= 0 && byteswritten >= 0 && bufsize > 0) {
- bytesread = buffer_read(read_data, buf, bufsize, desc);
+ bytesread = buffer_read(read_data, buf, bufsize);
if (bytesread < 0) {
if (errno == EINTR || errno == EAGAIN)
continue;
@@ -237,7 +235,7 @@ buffer_copy(struct buffer_data *read_data, struct
buffer_data *write_data,
}
writebuf = buf;
while (bytesread) {
- byteswritten = buffer_write(write_data, writebuf,
bytesread, desc);
+ byteswritten = buffer_write(write_data, writebuf,
bytesread);
if (byteswritten == -1) {
if (errno == EINTR || errno == EAGAIN)
continue;
diff --git a/lib/dpkg/buffer.h b/lib/dpkg/buffer.h
index 6700ec5..54f084f 100644
--- a/lib/dpkg/buffer.h
+++ b/lib/dpkg/buffer.h
@@ -100,10 +100,8 @@ off_t buffer_copy_IntInt(int i1, int typeIn, int i2, int
typeOut,
...) DPKG_ATTR_PRINTF(6);
off_t buffer_hash(const void *buf, void *hash, int typeOut, off_t length);
-off_t buffer_write(struct buffer_data *data, const void *buf,
- off_t length, const char *desc);
-off_t buffer_read(struct buffer_data *data, void *buf,
- off_t length, const char *desc);
+off_t buffer_write(struct buffer_data *data, const void *buf, off_t length);
+off_t buffer_read(struct buffer_data *data, void *buf, off_t length);
off_t buffer_init(struct buffer_data *read_data,
struct buffer_data *write_data);
off_t buffer_done(struct buffer_data *read_data,
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
