[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-309-g2ccd37b

[Guillem Jover]

The following commit has been merged in the master branch:
commit 3c83f54bfe1f7d17c878c0897f9762ea8adc64dc
Author: Guillem Jover <guil...@debian.org>
Date:   Fri Jun 17 14:11:43 2011 +0200

    libdpkg: Rename BUFFER_WRITE_MD5 to BUFFER_FILTER_MD5

diff --git a/lib/dpkg/buffer.c b/lib/dpkg/buffer.c
index 03cbf86..ce620dc 100644
--- a/lib/dpkg/buffer.c
+++ b/lib/dpkg/buffer.c
@@ -57,7 +57,7 @@ static off_t
 buffer_filter_init(struct buffer_data *data)
 {
        switch (data->type) {
-       case BUFFER_WRITE_MD5:
+       case BUFFER_FILTER_MD5:
                buffer_md5_init(data);
                break;
        }
@@ -87,7 +87,7 @@ static off_t
 buffer_filter_done(struct buffer_data *data)
 {
        switch (data->type) {
-       case BUFFER_WRITE_MD5:
+       case BUFFER_FILTER_MD5:
                buffer_md5_done(data);
                break;
        }
@@ -108,7 +108,7 @@ buffer_write(struct buffer_data *data, const void *buf, 
off_t length)
                break;
        case BUFFER_WRITE_NULL:
                break;
-       case BUFFER_WRITE_MD5:
+       case BUFFER_FILTER_MD5:
                MD5Update(&(((struct buffer_md5_ctx *)data->arg.ptr)->ctx), 
buf, length);
                break;
        default:
diff --git a/lib/dpkg/buffer.h b/lib/dpkg/buffer.h
index 4ee158c..ce89470 100644
--- a/lib/dpkg/buffer.h
+++ b/lib/dpkg/buffer.h
@@ -35,7 +35,7 @@ DPKG_BEGIN_DECLS
 #define BUFFER_WRITE_VBUF              1
 #define BUFFER_WRITE_FD                        2
 #define BUFFER_WRITE_NULL              3
-#define BUFFER_WRITE_MD5               5
+#define BUFFER_FILTER_MD5              5
 
 #define BUFFER_READ_FD                 0
 
@@ -48,10 +48,10 @@ struct buffer_data {
 };
 
 # define buffer_md5(buf, hash, limit) \
-       buffer_hash(buf, hash, BUFFER_WRITE_MD5, limit)
+       buffer_hash(buf, hash, BUFFER_FILTER_MD5, limit)
 
 # define fd_md5(fd, hash, limit, ...) \
-       buffer_copy_IntPtr(fd, BUFFER_READ_FD, hash, BUFFER_WRITE_MD5, \
+       buffer_copy_IntPtr(fd, BUFFER_READ_FD, hash, BUFFER_FILTER_MD5, \
                           limit, __VA_ARGS__)
 # define fd_fd_copy(fd1, fd2, limit, ...) \
        buffer_copy_IntInt(fd1, BUFFER_READ_FD, fd2, BUFFER_WRITE_FD, \

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org