diff -Naur ocfs2-tools-1.6.4//debugfs.ocfs2/commands.c ocfs2-tools-1.6.4.dlucio//debugfs.ocfs2/commands.c
--- ocfs2-tools-1.6.4//debugfs.ocfs2/commands.c	2010-12-10 20:37:07.000000000 +0100
+++ ocfs2-tools-1.6.4.dlucio//debugfs.ocfs2/commands.c	2011-08-06 09:29:58.000000000 +0200
@@ -687,7 +687,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);
@@ -695,7 +695,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.6.4//debugfs.ocfs2/find_block_inode.c ocfs2-tools-1.6.4.dlucio//debugfs.ocfs2/find_block_inode.c
--- ocfs2-tools-1.6.4//debugfs.ocfs2/find_block_inode.c	2010-12-10 20:37:07.000000000 +0100
+++ ocfs2-tools-1.6.4.dlucio//debugfs.ocfs2/find_block_inode.c	2011-08-06 09:33:11.000000000 +0200
@@ -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.6.4//extras/check_metaecc.c ocfs2-tools-1.6.4.dlucio//extras/check_metaecc.c
--- ocfs2-tools-1.6.4//extras/check_metaecc.c	2010-12-10 20:37:07.000000000 +0100
+++ ocfs2-tools-1.6.4.dlucio//extras/check_metaecc.c	2011-08-06 09:43:41.000000000 +0200
@@ -163,7 +163,7 @@
 		if (crc == new_check.bc_crc32e) {
 			snprintf(outbuf + result_offset,
 				sizeof(outbuf) - result_offset, "PASS\n");
-			fprintf(stderr, outbuf);
+			fprintf(stderr, "%s", outbuf);
 			goto do_check_end;
 		}
 
@@ -176,13 +176,13 @@
 		if (crc == new_check.bc_crc32e) {
 			snprintf(outbuf + result_offset,
 				sizeof(outbuf) - result_offset, "ECC Fixup\n");
-			fprintf(stderr, outbuf);
+			fprintf(stderr, "%s", outbuf);
 			goto do_check_end;
 		}
 
 		snprintf(outbuf + result_offset,
 			sizeof(outbuf) - result_offset, "FAIL\n");
-		fprintf(stderr, outbuf);
+		fprintf(stderr, "%s", outbuf);
 
 		offset = snprintf(outbuf, sizeof(outbuf), "Calculated");
 		while (offset < crc_offset)
@@ -190,7 +190,7 @@
 		snprintf(outbuf + crc_offset, sizeof(outbuf) - crc_offset,
 			"CRC32: %.8"PRIx32"    ECC: %.4"PRIx16"\n",
 			crc, ecc);
-		fprintf(stderr, outbuf);
+		fprintf(stderr, "%s", outbuf);
 		err = -1;
 do_check_end:
 		check.bc_crc32e = cpu_to_le32(new_check.bc_crc32e);
diff -Naur ocfs2-tools-1.6.4//fsck.ocfs2/problem.c ocfs2-tools-1.6.4.dlucio//fsck.ocfs2/problem.c
--- ocfs2-tools-1.6.4//fsck.ocfs2/problem.c	2008-12-03 19:38:21.000000000 +0100
+++ ocfs2-tools-1.6.4.dlucio//fsck.ocfs2/problem.c	2011-08-06 09:19:29.000000000 +0200
@@ -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.6.4//fswreck/chain.c ocfs2-tools-1.6.4.dlucio//fswreck/chain.c
--- ocfs2-tools-1.6.4//fswreck/chain.c	2010-12-10 20:37:08.000000000 +0100
+++ ocfs2-tools-1.6.4.dlucio//fswreck/chain.c	2011-08-06 09:51:04.000000000 +0200
@@ -198,10 +198,10 @@
 	struct ocfs2_super_block *sb = OCFS2_RAW_SB(fs->fs_super);
 	
 	if (slotnum == UINT16_MAX)
-		snprintf(sysfile, sizeof(sysfile),
+		snprintf(sysfile, sizeof(sysfile), "%s",
 		ocfs2_system_inodes[GLOBAL_BITMAP_SYSTEM_INODE].si_name);
 	else
-		snprintf(sysfile, sizeof(sysfile),
+		snprintf(sysfile, sizeof(sysfile), "%s",
 			ocfs2_system_inodes[INODE_ALLOC_SYSTEM_INODE].si_name,
 			slotnum);
 
@@ -254,7 +254,7 @@
 	uint64_t blkno;
 	struct ocfs2_super_block *sb = OCFS2_RAW_SB(fs->fs_super);
 
-	snprintf(sysfile, sizeof(sysfile),
+	snprintf(sysfile, sizeof(sysfile), "%s",
 		 ocfs2_system_inodes[GLOBAL_BITMAP_SYSTEM_INODE].si_name);
 
 	ret = ocfs2_lookup(fs, sb->s_system_dir_blkno, sysfile,
diff -Naur ocfs2-tools-1.6.4//fswreck/group.c ocfs2-tools-1.6.4.dlucio//fswreck/group.c
--- ocfs2-tools-1.6.4//fswreck/group.c	2010-12-10 20:37:08.000000000 +0100
+++ ocfs2-tools-1.6.4.dlucio//fswreck/group.c	2011-08-06 09:55:05.000000000 +0200
@@ -214,10 +214,10 @@
 	struct ocfs2_super_block *sb = OCFS2_RAW_SB(fs->fs_super);
 	
 	if (slotnum == UINT16_MAX)
-		snprintf(sysfile, sizeof(sysfile),
+		snprintf(sysfile, sizeof(sysfile), "%s",
 		ocfs2_system_inodes[GLOBAL_BITMAP_SYSTEM_INODE].si_name);
 	else
-		snprintf(sysfile, sizeof(sysfile),
+		snprintf(sysfile, sizeof(sysfile), "%s",
 			ocfs2_system_inodes[INODE_ALLOC_SYSTEM_INODE].si_name,
 			slotnum);
 
diff -Naur ocfs2-tools-1.6.4//mount.ocfs2/mount.ocfs2.c ocfs2-tools-1.6.4.dlucio//mount.ocfs2/mount.ocfs2.c
--- ocfs2-tools-1.6.4//mount.ocfs2/mount.ocfs2.c	2010-12-29 07:30:55.000000000 +0100
+++ ocfs2-tools-1.6.4.dlucio//mount.ocfs2/mount.ocfs2.c	2011-08-06 09:38:30.000000000 +0200
@@ -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.6.4//tunefs.ocfs2/op_query.c ocfs2-tools-1.6.4.dlucio//tunefs.ocfs2/op_query.c
--- ocfs2-tools-1.6.4//tunefs.ocfs2/op_query.c	2009-04-14 00:10:40.000000000 +0200
+++ ocfs2-tools-1.6.4.dlucio//tunefs.ocfs2/op_query.c	2011-08-06 09:26:09.000000000 +0200
@@ -150,7 +150,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(query_fs->fs_super)->s_label);
 
 	return print_string(stream, info, args, label);
@@ -338,7 +338,7 @@
 	register_printf_function('O', handle_ro_compat, handle_arginfo);
 
 	query_fs = fs;
-	fprintf(stdout, fmt);
+	fprintf(stdout, "%s", fmt);
 	query_fs = NULL;
 
 	ocfs2_free(&fmt);