Merge branch 'master' of github.com:axboe/fio into fixtype

diff --git a/backend.c b/backend.c
index 975317f26f1145de277709366ca2cf108c92f32f..d6d3a6704c11cff3aafd51f2d6052f6941b3527a 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -1242,7 +1242,8 @@ static int keep_running(struct thread_data *td)
 
 static int exec_string(struct thread_options *o, const char *string, const char *mode)
 {
-       int ret, newlen = strlen(string) + strlen(o->name) + strlen(mode) + 9 + 1;
+       size_t newlen = strlen(string) + strlen(o->name) + strlen(mode) + 9 + 1;
+       int ret; /* newlen = strlen(string) + strlen(o->name) + strlen(mode) + 9 + 1; */
        char *str;
 
        str = malloc(newlen);