test: add printf-attribute to test_msg

...and fix misprints that weren't caught before.

I guess, I never fixed that much (possible) bugs by one commit, heh.
Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>

test/zdtm/lib/test.c

@@ -204,7 +204,7 @@ void test_init(int argc, char **argv)
 		if (futex_get(&sig_received) == SIGCHLD) {
 			int ret;
 			if (waitpid(pid, &ret, 0) != pid) {
-				pr_perror("Unable to wait %d, pid");
+				pr_perror("Unable to wait %d", pid);
 				exit(1);
 			}
 

test/zdtm/lib/zdtmtst.h

@@ -31,7 +31,8 @@ extern int test_fork_id(int id);
 /* finish setting up the test, write out pid file, and go to background */
 extern void test_daemon(void);
 /* store a message to a static buffer */
-extern void test_msg(const char *format, ...);
+extern void test_msg(const char *format, ...)
+	__attribute__ ((__format__ (__printf__, 1, 2)));
 /* tell if SIGTERM hasn't been received yet */
 extern int test_go(void);
 /* sleep until SIGTERM is delivered */

test/zdtm/static/autofs.c

@@ -188,7 +188,7 @@ static int check_fd(struct autofs_params *p)
 	}
 
 	if (st.st_dev != p->fd_stat.st_dev) {
-		skip("%s: st_dev differs: %d != %d "
+		skip("%s: st_dev differs: %lu != %lu "
 		     "(waiting for \"device namespaces\")", p->mountpoint,
 				st.st_dev, p->fd_stat.st_dev);
 //		ret++;
@@ -199,37 +199,37 @@ static int check_fd(struct autofs_params *p)
 		ret++;
 	}
 	if (st.st_nlink != p->fd_stat.st_nlink) {
-		pr_err("%s: st_nlink differs:\n", p->mountpoint,
+		pr_err("%s: st_nlink differs: %ld != %ld\n", p->mountpoint,
 				st.st_nlink, p->fd_stat.st_nlink);
 		ret++;
 	}
 	if (st.st_uid != p->fd_stat.st_uid) {
-		pr_err("%s: st_uid differs:\n", p->mountpoint,
+		pr_err("%s: st_uid differs: %u != %u\n", p->mountpoint,
 				st.st_uid, p->fd_stat.st_uid);
 		ret++;
 	}
 	if (st.st_gid != p->fd_stat.st_gid) {
-		pr_err("%s: st_gid differs:\n", p->mountpoint,
+		pr_err("%s: st_gid differs: %u != %u\n", p->mountpoint,
 				st.st_gid, p->fd_stat.st_gid);
 		ret++;
 	}
 	if (st.st_rdev != p->fd_stat.st_rdev) {
-		pr_err("%s: st_rdev differs:\n", p->mountpoint,
+		pr_err("%s: st_rdev differs: %ld != %ld\n", p->mountpoint,
 				st.st_rdev, p->fd_stat.st_rdev);
 		ret++;
 	}
 	if (st.st_size != p->fd_stat.st_size) {
-		pr_err("%s: st_size differs:\n", p->mountpoint,
+		pr_err("%s: st_size differs: %ld != %ld\n", p->mountpoint,
 				st.st_size, p->fd_stat.st_size);
 		ret++;
 	}
 	if (st.st_blksize != p->fd_stat.st_blksize) {
-		pr_err("%s: st_blksize differs:\n", p->mountpoint,
+		pr_err("%s: st_blksize differs %ld != %ld:\n", p->mountpoint,
 				st.st_blksize, p->fd_stat.st_blksize);
 		ret++;
 	}
 	if (st.st_blocks != p->fd_stat.st_blocks) {
-		pr_err("%s: st_blocks differs:\n", p->mountpoint,
+		pr_err("%s: st_blocks differs: %ld != %ld\n", p->mountpoint,
 				st.st_blocks, p->fd_stat.st_blocks);
 		ret++;
 	}
@@ -244,7 +244,7 @@ static int check_automount(struct autofs_params *p)
 
 	err = check_fd(p);
 	if (err) {
-		pr_err("%d: opened file descriptor wasn't migrated properly\n",
+		pr_err("%s: opened file descriptor wasn't migrated properly\n",
 				p->mountpoint);
 		return err;
 	}
@@ -441,7 +441,7 @@ static int automountd_serve(const char *mountpoint, struct autofs_params *p,
 					getpid());
 			return -EINVAL;
 		default:
-			pr_err("unknown request type: %ld\n", packet->hdr.type);
+			pr_err("unknown request type: %d\n", packet->hdr.type);
 			return -EINVAL;
 	}
 
@@ -608,7 +608,7 @@ static int start_automounter(struct autofs_params *p)
 		return -errno;
 	}
 	if (bytes != sizeof(ret)) {
-		pr_err("received less than expected: %d. Child %d died?\n",
+		pr_err("received less than expected: %zu. Child %d died?\n",
 				bytes, p->pid);
 		return -EINVAL;
 	}

test/zdtm/static/cgroup_stray.c

@@ -207,7 +207,7 @@ int main(int argc, char **argv)
 	}
 
 	if (!WIFEXITED(status) || WEXITSTATUS(status)) {
-		fail("exit status %s\n", status);
+		fail("exit status %d\n", status);
 		goto out_umount;
 	}
 

test/zdtm/static/deleted_dev.c

@@ -50,7 +50,7 @@ int main(int argc, char **argv)
 
 	if (st.st_mode != mode || st.st_rdev != dev) {
 		fail("%s is no longer the device file we had", filename);
-		test_msg("mode %x want %x, dev %x want %x\n",
+		test_msg("mode %x want %x, dev %lx want %lx\n",
 				st.st_mode, mode, st.st_rdev, dev);
 		goto out;
 	}
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
 	}
 
 	if (unlink(filename) != -1 || errno != ENOENT) {
-		fail("file %s should have been deleted before migration: unlink: %m\n");
+		fail("file %s should have been deleted before migration: unlink: %m\n", filename);
 		goto out;
 	}
 

test/zdtm/static/deleted_unix_sock.c

@@ -180,7 +180,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (unlink(filename) != -1 || errno != ENOENT) {
-		fail("file %s should have been deleted before migration: unlink: %m\n");
+		fail("file %s should have been deleted before migration: unlink: %m\n", filename);
 		goto out;
 	}
 

test/zdtm/static/fdt_shared.c

@@ -175,7 +175,7 @@ int main(int argc, char ** argv)
 
 	fd = dup2(fd, TEST_FD);
 	if (fd == -1) {
-		pr_perror("Can't dup fd to %d", fd, TEST_FD);
+		pr_perror("Can't dup fd %d to %d", fd, TEST_FD);
 		return -1;
 	}
 

test/zdtm/static/file_attr.c

@@ -108,7 +108,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (unlink(filename) != -1 || errno != ENOENT) {
-		fail("file %s should have been deleted before migration: unlink: %m\n");
+		fail("file %s should have been deleted before migration: unlink: %m\n", filename);
 		goto out_noclose;
 	}
 

test/zdtm/static/inotify_system.c

@@ -296,8 +296,8 @@ next_event:
 int read_set(int inot_fd, char *event_set) {
 	int len;
 	if ((len = read(inot_fd, event_set, EVENT_BUF_LEN)) < 0) {
-		pr_perror("read(%d, buf, %d) Failed, errno=%d : %s",
-			inot_fd, EVENT_BUF_LEN, errno, strerror(errno));
+		pr_perror("read(%d, buf, %lu) Failed, errno=%d",
+			inot_fd, EVENT_BUF_LEN, errno);
 		return -1;
 	}
 	return len;

test/zdtm/static/inotify_system_nodel.c

@@ -296,8 +296,7 @@ next_event:
 int read_set(int inot_fd, char *event_set) {
 	int len;
 	if ((len = read(inot_fd, event_set, EVENT_BUF_LEN)) < 0) {
-		pr_perror("read(%d, buf, %d) Failed, errno=%d : %s",
-			inot_fd, EVENT_BUF_LEN, errno, strerror(errno));
+		pr_perror("read(%d, buf, %lu) Failed", inot_fd, EVENT_BUF_LEN);
 		return -1;
 	}
 	return len;

test/zdtm/static/ipc_namespace.c

@@ -73,7 +73,7 @@ static int read_ipc_sysctl(char *name, int *data, size_t size)
 
 	fd = open(name, O_RDONLY);
 	if (fd < 0) {
-		pr_perror("Can't open %d", name);
+		pr_perror("Can't open %s", name);
 		return fd;
 	}
 	ret = read(fd, buf, 32);
@@ -212,7 +212,7 @@ static int rand_ipc_sysctl(char *name, unsigned int val)
 
 	fd = open(name, O_WRONLY);
 	if (fd < 0) {
-		pr_perror("Can't open %d", name);
+		pr_perror("Can't open %s", name);
 		return fd;
 	}
 	sprintf(buf, "%d\n", val);
@@ -318,10 +318,10 @@ static void show_ipc_entry(struct ipc_ns *old, struct ipc_ns *new)
 		pr_perror("auto_msgmni differs: %d ---> %d",
 			old->auto_msgmni, new->auto_msgmni);
 	if (old->shm_ctlmax != new->shm_ctlmax)
-		pr_perror("shm_ctlmax differs: %d ---> %d",
+		pr_perror("shm_ctlmax differs: %zu ---> %zu",
 			old->shm_ctlmax, new->shm_ctlmax);
 	if (old->shm_ctlall != new->shm_ctlall)
-		pr_perror("shm_ctlall differs: %d ---> %d",
+		pr_perror("shm_ctlall differs: %zu ---> %zu",
 			old->shm_ctlall, new->shm_ctlall);
 	if (old->shm_ctlmni != new->shm_ctlmni)
 		pr_perror("shm_ctlmni differs: %d ---> %d",

test/zdtm/static/link10.c

@@ -59,8 +59,9 @@ int main(int argc, char ** argv)
 
 	if (stat.st_ino != stat2.st_ino ||
 	    stat.st_dev != stat2.st_dev) {
-		fail("files are different: st_ino %d != %d or st_dev %d != %d",
-		     stat.st_ino, stat2.st_ino, stat.st_dev, stat2.st_dev);
+		fail("files are different: st_ino %lu != %lu or st_dev %lu != %lu",
+		     (long unsigned)stat.st_ino, (long unsigned)stat2.st_ino,
+		     (long unsigned)stat.st_dev, (long unsigned)stat2.st_dev);
 	}
 
 	pass();

test/zdtm/static/maps02.c

@@ -87,7 +87,7 @@ int main(int argc, char **argv)
 			return -1;
 
 		if (m[i].orig_flags != m[i].new_flags) {
-			pr_perror("Flags are changed %lx %lx -> %lx (%d)",
+			pr_perror("Flags are changed %lx %lx -> %lx (%zu)",
 			    (unsigned long)m[i].start,
 			    m[i].orig_flags, m[i].new_flags, i);
 			fail();
@@ -95,7 +95,7 @@ int main(int argc, char **argv)
 		}
 
 		if (m[i].orig_madv != m[i].new_madv) {
-			pr_perror("Madvs are changed %lx %lx -> %lx (%d)",
+			pr_perror("Madvs are changed %lx %lx -> %lx (%zu)",
 			    (unsigned long)m[i].start,
 			    m[i].orig_madv, m[i].new_madv, i);
 			fail();

test/zdtm/static/mlock_setuid.c

@@ -21,7 +21,8 @@ int main(int argc, char **argv)
 		return -1;
 	}
 
-	test_msg("Lock vma from %lx to %lx\n", start, start + MEM_SIZE);
+	test_msg("Lock vma from %p to %lx\n",
+			start, (unsigned long)start + MEM_SIZE);
 	ret = mlock(start, MEM_SIZE);
 	if (ret < 0) {
 		pr_perror("mlock");

test/zdtm/static/mntns_link_remap.c

@@ -118,7 +118,7 @@ int ns_child(void *_arg)
 #else
 	if (st1.st_nlink != 0) {
 #endif
-		pr_perror("Wrong number of links: %d", st1.st_nlink);
+		pr_perror("Wrong number of links: %lu", st1.st_nlink);
 		exit(1);
 	}
 

test/zdtm/static/mtime_mmap.c

@@ -79,7 +79,7 @@ int main(int argc, char **argv)
 	mtime_new = fst.st_mtime;
 	/* time of last modification */
 	if (mtime_new <= mtime_old) {
-		fail("mtime %d wasn't updated on mmapped %s file",
+		fail("mtime %ld wasn't updated on mmapped %s file",
 			mtime_new, filename);
 		goto failed;
 	}
@@ -102,8 +102,7 @@ int main(int argc, char **argv)
 
 	/* time of last modification */
 	if (fst.st_mtime != mtime_new) {
-		fail("After migration, mtime changed to %d",
-			fst.st_mtime);
+		fail("After migration, mtime changed to %ld", fst.st_mtime);
 		goto failed;
 	}
 

test/zdtm/static/overmount_dev.c

@@ -71,7 +71,7 @@ int main(int argc, char **argv)
 	}
 
 	if (st.st_mode != mode || st.st_rdev != dev) {
-		fail("%s is no longer the device file we had");
+		fail("%s is no longer the device file we had", path);
 		goto unlink;
 	}
 

test/zdtm/static/overmount_fifo.c

@@ -69,7 +69,7 @@ int main(int argc, char **argv)
 	}
 
 	if (st.st_mode != mode) {
-		fail("%s is no longer the fifo we had");
+		fail("%s is no longer the fifo we had", path);
 		goto unlink;
 	}
 

test/zdtm/static/sem.c

@@ -163,7 +163,7 @@ int main(int argc, char **argv)
 			goto out_destroy;
 		}
 		if (val[i] != 0) {
-			fail("Non-zero sem %d value: %d", val);
+			fail("Non-zero sem %d value: %d", i, val[i]);
 			fail_count++;
 		}
 	}

test/zdtm/static/session00.c

@@ -226,7 +226,7 @@ int main(int argc, char ** argv)
 
 	pid = wait(&status);
 	if (pid != -1 || errno != ECHILD) {
-		pr_perror("%d isn't waited");
+		pr_perror("%d isn't waited", pid);
 		err++;
 	}
 

test/zdtm/static/session02.c

@@ -199,7 +199,7 @@ static int send_command(int id, enum commands op, int arg1, int arg2)
 	}
 
 	if (status) {
-		pr_perror("The command(%d, %d, %d) failed");
+		pr_perror("The command(%d, %d, %d) failed", op, arg1, arg2);
 		goto err;
 	}
 

test/zdtm/static/session03.c

@@ -244,7 +244,7 @@ static int send_command(int id, enum commands op, int arg)
 	}
 
 	if (status) {
-		pr_perror("The command(%d, %d, %d) failed");
+		pr_perror("The command(%d, %d) failed", op, arg);
 		goto err;
 	}
 

test/zdtm/static/sigaltstack.c

@@ -43,7 +43,7 @@ static int sascmp(stack_t *old, stack_t *new)
 
 static void show_ss(char *prefix, stack_t *s)
 {
-	test_msg("%20s: at %p (size %#8x flags %#2x)\n",
+	test_msg("%20s: at %p (size %8zu flags %#2x)\n",
 		 prefix, s->ss_sp, s->ss_size, s->ss_flags);
 }
 

test/zdtm/static/unlink_fstat00.c

@@ -64,7 +64,7 @@ int main(int argc, char ** argv)
 	}
 	/* Change file size */
 	if (fst.st_size != 0) {
-		pr_perror("%s file size eq %d", fst.st_size);
+		pr_perror("%s file size eq %ld", filename, (long)fst.st_size);
 		goto failed;
 	}
 
@@ -111,12 +111,14 @@ int main(int argc, char ** argv)
 
 	/* Check file size */
 	if (fst.st_size != fsize) {
-		fail("(via fstat): file size changed to %d", fst.st_size);
+		fail("(via fstat): file size changed to %ld",
+				(long)fst.st_size);
 		goto failed;
 	}
 	fst.st_size = lseek(fd, 0, SEEK_END);
 	if (fst.st_size != fsize) {
-		fail("(via lseek): file size changed to %d", fst.st_size);
+		fail("(via lseek): file size changed to %ld",
+				(long)fst.st_size);
 		goto failed;
 	}
 	/* Check mode */

test/zdtm/static/unlink_fstat01.c

@@ -34,7 +34,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (fst.st_size != 0) {
-		pr_perror("%s file size eq %d", fst.st_size);
+		pr_perror("%s file size eq %ld", filename, (long)fst.st_size);
 		goto failed;
 	}
 
@@ -70,13 +70,13 @@ int main(int argc, char ** argv)
 	}
 
 	if (fst.st_size != fsize) {
-		fail("(via fstat): file size changed to %d", fst.st_size);
+		fail("(via fstat): file size changed to %ld", fst.st_size);
 		goto failed;
 	}
 
 	fst.st_size = lseek(fd, 0, SEEK_END);
 	if (fst.st_size != fsize) {
-		fail("(via lseek): file size changed to %d", fst.st_size);
+		fail("(via lseek): file size changed to %ld", fst.st_size);
 		goto failed;
 	}
 

test/zdtm/static/unlink_fstat02.c

@@ -47,7 +47,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (fst.st_size != 0) {
-		pr_perror("%s file size eq %d", fst.st_size);
+		pr_perror("%s file size eq %ld", filename, fst.st_size);
 		goto failed;
 	}
 
@@ -86,13 +86,13 @@ int main(int argc, char ** argv)
 	}
 
 	if (fst.st_size != fsize) {
-		fail("(via fstat): file size changed to %d", fst.st_size);
+		fail("(via fstat): file size changed to %ld", fst.st_size);
 		goto failed;
 	}
 
 	fst.st_size = lseek(fd[0], 0, SEEK_END);
 	if (fst.st_size != fsize) {
-		fail("(via lseek): file size changed to %d", fst.st_size);
+		fail("(via lseek): file size changed to %ld", fst.st_size);
 		goto failed;
 	}
 

test/zdtm/static/unlink_fstat03.c

@@ -44,7 +44,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (fst.st_size != 0) {
-		pr_perror("%s file size eq %d", fst.st_size);
+		pr_perror("%s file size eq %ld", filename, fst.st_size);
 		goto failed;
 	}
 
@@ -84,13 +84,13 @@ int main(int argc, char ** argv)
 	}
 
 	if (fst2.st_size != fsize) {
-		fail("(via fstat): file size changed to %d", fst.st_size);
+		fail("(via fstat): file size changed to %ld", fst.st_size);
 		goto failed;
 	}
 
 	fst2.st_size = lseek(fd, 0, SEEK_END);
 	if (fst2.st_size != fsize) {
-		fail("(via lseek): file size changed to %d", fst.st_size);
+		fail("(via lseek): file size changed to %ld", fst.st_size);
 		goto failed;
 	}
 

test/zdtm/static/unlink_largefile.c

@@ -28,8 +28,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (lseek64(fd, offset, SEEK_SET) < 0) {
-		pr_perror("can't lseek %s, offset= %x", filename,
-			offset);
+		pr_perror("can't lseek %s, offset= %lx", filename, offset);
 		goto failed;
 	}
 

test/zdtm/static/unlink_regular00.c

@@ -88,7 +88,8 @@ int main(int argc, char ** argv)
 	}
 
 	if (strcmp(buf, MSG)) {
-		fail("content differs: %s, %s, sizeof=%d", buf, MSG, sizeof(MSG));
+		fail("content differs: %s, %s, sizeof=%zu",
+				buf, MSG, sizeof(MSG));
 		goto close_file;
 	}
 

test/zdtm/static/write_read10.c

@@ -116,7 +116,8 @@ int main(int argc, char ** argv)
 	}
 
 	if (unlink(filename) != -1 || errno != ENOENT) {
-		fail("file %s should have been deleted before migration: unlink: %m\n");
+		fail("file %s should have been deleted before migration: unlink: %m\n",
+				filename);
 		goto out_noclose;
 	}
 

test/zdtm/transition/maps007.c

@@ -84,7 +84,8 @@ int main(int argc, char **argv)
 				/* shm->delta must be always bigger than MAX_DELTA */
 				futex_wait_while_lt(&shm->delta, MAX_DELTA + 2);
 			else if (count % 100 == 0)
-				test_msg("count %d delta %d\n", count, futex_get(&shm->delta)); /* heartbeat */
+				test_msg("count %llu delta %d\n",
+						count, futex_get(&shm->delta)); /* heartbeat */
 
 			if (futex_get(&shm->stop) && atomic_get(&shm->delta.raw) == MAX_DELTA)
 				break;
@@ -123,7 +124,7 @@ int main(int argc, char **argv)
 			t[0] = lrand48();
 		}
 	}
-	test_msg("count %d\n", count);
+	test_msg("count %llu\n", count);
 
 	if (child == 0) {
 		if (!test_go())

test/zdtm/transition/pipe_loop00.c

@@ -113,7 +113,7 @@ int main(int argc, char **argv)
 			if (errno == EINTR)
 				continue;
 			else {
-				fail("write failed: %m\n", i);
+				fail("write failed\n");
 				ret = 1;
 				break;
 			}

test/zdtm/transition/socket_loop00.c

@@ -115,7 +115,7 @@ int main(int argc, char **argv)
 			if (errno == EINTR)
 				continue;
 			else {
-				fail("write failed: %m\n", i);
+				fail("write failed\n");
 				ret = 1;
 				break;
 			}