[PATCH] blktrace: Don't overwrite buf_size for the vbuffer

Here's another patch to fix a problem I noticed - the code that sets
the buffer size passed to setvbuf() uses the global buf_size variable
and thus unintentionally sets that variable, which is used elsewhere
later e.g. setting tip->fd_max_size in extract().

diff --git a/blktrace.c b/blktrace.c
index 2b358743341445446d81574ead5782821aec3f96..1abafcb44efb63e0785d6e6b2d6e7c2656f22ef8 100644 (file)
--- a/blktrace.c
+++ b/blktrace.c
@@ -623,7 +623,7 @@ static int start_threads(struct device_information *dip)
        struct thread_information *tip;
        char op[64];
        int j, pipeline = output_name && !strcmp(output_name, "-");
-       int len, mode;
+       int len, mode, vbuf_size;
 
        for_each_tip(dip, tip, j) {
                tip->cpu = j;
@@ -635,7 +635,7 @@ static int start_threads(struct device_information *dip)
                        tip->ofile = fdopen(STDOUT_FILENO, "w");
                        tip->fd_lock = &stdout_mutex;
                        mode = _IOLBF;
-                       buf_size = 512;
+                       vbuf_size = 512;
                } else {
                        len = 0;
 
@@ -651,7 +651,7 @@ static int start_threads(struct device_information *dip)
                        }
                        tip->ofile = fopen(op, "w");
                        mode = _IOFBF;
-                       buf_size = OFILE_BUF;
+                       vbuf_size = OFILE_BUF;
                }
 
                if (tip->ofile == NULL) {
@@ -659,8 +659,8 @@ static int start_threads(struct device_information *dip)
                        return 1;
                }
 
-               tip->ofile_buffer = malloc(buf_size);
-               if (setvbuf(tip->ofile, tip->ofile_buffer, mode, buf_size)) {
+               tip->ofile_buffer = malloc(vbuf_size);
+               if (setvbuf(tip->ofile, tip->ofile_buffer, mode, vbuf_size)) {
                        perror("setvbuf");
                        close_thread(tip);
                        return 1;