X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=36c1839b18767ef3910a44f4fb56333f2562e2c5;hp=37cf050894099ba5be67fccfc9b194c53201b56c;hb=690089990d051d86b4ef2b6fd5c1972c0dd4897b;hpb=f8977ee606bc51138a77f6a1b653df00faa77742

diff --git a/init.c b/init.c
index 37cf0508..36c1839b 100644
--- a/init.c
+++ b/init.c
@@ -409,7 +409,7 @@ static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = {
 
 static int def_timeout = DEF_TIMEOUT;
 
-static char fio_version_string[] = "fio 1.7";
+static char fio_version_string[] = "fio 1.9";
 
 static char **ini_file;
 static int max_jobs = MAX_JOBS;
@@ -417,7 +417,6 @@ static int max_jobs = MAX_JOBS;
 struct thread_data def_thread;
 struct thread_data *threads = NULL;
 
-int rate_quit = 0;
 int exitall_on_terminate = 0;
 int terse_output = 0;
 unsigned long long mlock_size = 0;
@@ -517,16 +516,16 @@ static void fixup_options(struct thread_data *td)
 static char *to_kmg(unsigned int val)
 {
 	char *buf = malloc(32);
-	char post[] = { 0, 'K', 'G', 'P', -1 };
+	char post[] = { 0, 'K', 'M', 'G', 'P', 0 };
 	char *p = post;
 
-	while (*p != -1) {
+	do {
 		if (val & 1023)
 			break;
 
 		val >>= 10;
 		p++;
-	}
+	} while (*p);
 
 	snprintf(buf, 31, "%u%c", val, *p);
 	return buf;
@@ -539,8 +538,8 @@ static char *to_kmg(unsigned int val)
  */
 static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 {
-	char *ddir_str[] = { "read", "write", "randread", "randwrite",
-			     "rw", NULL, "randrw" };
+	const char *ddir_str[] = { "read", "write", "randread", "randwrite",
+				   "rw", NULL, "randrw" };
 	struct stat sb;
 	int numjobs, ddir, i;
 	struct fio_file *f;
@@ -849,7 +848,8 @@ static int str_ioengine_cb(void *data, const char *str)
 	if (td->io_ops)
 		return 0;
 
-	log_err("fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice, cpu\n");
+	log_err("fio: ioengine= libaio, posixaio, sync, mmap, sgio, splice, cpu, null\n");
+	log_err("fio: or specify path to dynamic ioengine module\n");
 	return 1;
 }