diff -Naur ocfs2-tools-1.4.1/debugfs.ocfs2/commands.c ocfs2-tools-1.4.1-fix-format-errors/debugfs.ocfs2/commands.c
--- ocfs2-tools-1.4.1/debugfs.ocfs2/commands.c	2008-07-23 20:24:32.000000000 +0200
+++ ocfs2-tools-1.4.1-fix-format-errors/debugfs.ocfs2/commands.c	2009-03-05 21:31:34.000000000 +0100
@@ -667,7 +667,7 @@
 	gbls.cwd = strdup("/");
 
 	/* lookup heartbeat file */
-	snprintf (sysfile, sizeof(sysfile),
+	snprintf (sysfile, sizeof(sysfile), "%s",
 		  ocfs2_system_inodes[HEARTBEAT_SYSTEM_INODE].si_name);
 	ret = ocfs2_lookup(gbls.fs, gbls.sysdir_blkno, sysfile,
 			   strlen(sysfile), NULL, &gbls.hb_blkno);
@@ -675,7 +675,7 @@
 		gbls.hb_blkno = 0;
 
 	/* lookup slotmap file */
-	snprintf (sysfile, sizeof(sysfile),
+	snprintf (sysfile, sizeof(sysfile), "%s",
 		  ocfs2_system_inodes[SLOT_MAP_SYSTEM_INODE].si_name);
 	ret = ocfs2_lookup(gbls.fs, gbls.sysdir_blkno, sysfile,
 			   strlen(sysfile), NULL, &gbls.slotmap_blkno);
diff -Naur ocfs2-tools-1.4.1/debugfs.ocfs2/find_block_inode.c ocfs2-tools-1.4.1-fix-format-errors/debugfs.ocfs2/find_block_inode.c
--- ocfs2-tools-1.4.1/debugfs.ocfs2/find_block_inode.c	2008-07-22 00:44:25.000000000 +0200
+++ ocfs2-tools-1.4.1-fix-format-errors/debugfs.ocfs2/find_block_inode.c	2009-03-05 21:33:54.000000000 +0100
@@ -203,7 +203,7 @@
 	char sysfile[50];
 	errcode_t ret = 0;
 
-	snprintf(sysfile, sizeof(sysfile),
+	snprintf(sysfile, sizeof(sysfile), "%s",
 		 ocfs2_system_inodes[GLOBAL_BITMAP_SYSTEM_INODE].si_name);
 
 	ret = ocfs2_lookup(fs, fs->fs_sysdir_blkno, sysfile,
diff -Naur ocfs2-tools-1.4.1/fsck.ocfs2/problem.c ocfs2-tools-1.4.1-fix-format-errors/fsck.ocfs2/problem.c
--- ocfs2-tools-1.4.1/fsck.ocfs2/problem.c	2008-06-24 23:02:52.000000000 +0200
+++ ocfs2-tools-1.4.1-fix-format-errors/fsck.ocfs2/problem.c	2009-03-05 21:17:29.000000000 +0100
@@ -112,9 +112,9 @@
 		ans = ost->ost_answer ? 'y' : 'n';
 	} else {
 		if (flags & PY)
-			printf(yes);
+			printf("%s", yes);
 		else if (flags & PN)
-			printf(no);
+			printf("%s", no);
 	}
 
 	fflush(stdout);
diff -Naur ocfs2-tools-1.4.1/include/ocfs2-kernel/ocfs2_fs.h ocfs2-tools-1.4.1-fix-format-errors/include/ocfs2-kernel/ocfs2_fs.h
--- ocfs2-tools-1.4.1/include/ocfs2-kernel/ocfs2_fs.h	2008-07-23 20:27:57.000000000 +0200
+++ ocfs2-tools-1.4.1-fix-format-errors/include/ocfs2-kernel/ocfs2_fs.h	2009-03-05 21:14:34.000000000 +0100
@@ -895,7 +895,7 @@
          * list has a copy per slot.
          */
 	if (type <= OCFS2_LAST_GLOBAL_SYSTEM_INODE)
-		chars = snprintf(buf, len,
+		chars = snprintf(buf, len, "%s",
 				 ocfs2_system_inodes[type].si_name);
 	else
 		chars = snprintf(buf, len,
diff -Naur ocfs2-tools-1.4.1/mount.ocfs2/mount.ocfs2.c ocfs2-tools-1.4.1-fix-format-errors/mount.ocfs2/mount.ocfs2.c
--- ocfs2-tools-1.4.1/mount.ocfs2/mount.ocfs2.c	2008-07-22 00:44:25.000000000 +0200
+++ ocfs2-tools-1.4.1-fix-format-errors/mount.ocfs2/mount.ocfs2.c	2009-03-05 21:48:34.000000000 +0100
@@ -185,7 +185,7 @@
 	}
 
 	if (mo->type && strcmp(mo->type, OCFS2_FS_NAME)) {
-		com_err(progname, OCFS2_ET_UNKNOWN_FILESYSTEM, mo->type);
+		com_err(progname, OCFS2_ET_UNKNOWN_FILESYSTEM, "%s", mo->type);
 		return -1;
 	}
 
diff -Naur ocfs2-tools-1.4.1/tunefs.ocfs2/query.c ocfs2-tools-1.4.1-fix-format-errors/tunefs.ocfs2/query.c
--- ocfs2-tools-1.4.1/tunefs.ocfs2/query.c	2008-07-22 00:44:25.000000000 +0200
+++ ocfs2-tools-1.4.1-fix-format-errors/tunefs.ocfs2/query.c	2009-03-05 21:25:46.000000000 +0100
@@ -157,7 +157,7 @@
 {
 	char label[OCFS2_MAX_VOL_LABEL_LEN + 1];
 
-	snprintf(label, OCFS2_MAX_VOL_LABEL_LEN + 1,
+	snprintf(label, OCFS2_MAX_VOL_LABEL_LEN + 1, "%s",
 		 (char *)OCFS2_RAW_SB(fs_gbl->fs_super)->s_label);
 
 	return print_string(stream, info, args, label);
@@ -329,6 +329,6 @@
 	register_printf_function('H', handle_incompat, handle_arginfo);
 	register_printf_function('O', handle_ro_compat, handle_arginfo);
 
-	fprintf(stdout, fmt);
+	fprintf(stdout, "%s", fmt);
 	free(fmt);
 }
diff -Naur ocfs2-tools-1.4.1/tunefs.ocfs2/sparse_file.c ocfs2-tools-1.4.1-fix-format-errors/tunefs.ocfs2/sparse_file.c
--- ocfs2-tools-1.4.1/tunefs.ocfs2/sparse_file.c	2008-07-22 00:44:25.000000000 +0200
+++ ocfs2-tools-1.4.1-fix-format-errors/tunefs.ocfs2/sparse_file.c	2009-03-05 21:28:19.000000000 +0100
@@ -176,7 +176,7 @@
 	if (ret)
 		goto bail;
 
-	snprintf(file_name, sizeof(file_name),
+	snprintf(file_name, sizeof(file_name), "%s",
 		 ocfs2_system_inodes[GLOBAL_BITMAP_SYSTEM_INODE].si_name);
 
 	ret = ocfs2_lookup(fs, sb->s_system_dir_blkno, file_name,