[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[RFC/PATCH 3/4] libdpkg: Make buffer_init() and buffer_done() return void



In principle, these functions could return an error code for the
caller to check, but since that is not what happens, it is
clearer to make them return void.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 lib/dpkg/buffer.c |    6 ++----
 lib/dpkg/buffer.h |    4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/dpkg/buffer.c b/lib/dpkg/buffer.c
index def6c58..a760250 100644
--- a/lib/dpkg/buffer.c
+++ b/lib/dpkg/buffer.c
@@ -172,7 +172,7 @@ read_stream(struct buffer_data *data, void *buf, off_t length)
  * Generic input and output.
  */
 
-off_t
+void
 buffer_init(struct buffer_data *read_data, struct buffer_data *write_data)
 {
 	switch (write_data->type) {
@@ -180,10 +180,9 @@ buffer_init(struct buffer_data *read_data, struct buffer_data *write_data)
 		buffer_md5_init(write_data);
 		break;
 	}
-	return 0;
 }
 
-off_t
+void
 buffer_done(struct buffer_data *read_data, struct buffer_data *write_data)
 {
 	switch (write_data->type) {
@@ -191,7 +190,6 @@ buffer_done(struct buffer_data *read_data, struct buffer_data *write_data)
 		buffer_md5_done(write_data);
 		break;
 	}
-	return 0;
 }
 
 off_t
diff --git a/lib/dpkg/buffer.h b/lib/dpkg/buffer.h
index 54f084f..b09215d 100644
--- a/lib/dpkg/buffer.h
+++ b/lib/dpkg/buffer.h
@@ -102,9 +102,9 @@ 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);
 off_t buffer_read(struct buffer_data *data, void *buf, off_t length);
-off_t buffer_init(struct buffer_data *read_data,
+void buffer_init(struct buffer_data *read_data,
                   struct buffer_data *write_data);
-off_t buffer_done(struct buffer_data *read_data,
+void buffer_done(struct buffer_data *read_data,
                   struct buffer_data *write_data);
 off_t buffer_copy(struct buffer_data *read_data,
                   struct buffer_data *write_data,
-- 
1.7.0.3


Reply to: