From 62579b84d4a0c3eaa89936979b606d686de32f25 Mon Sep 17 00:00:00 2001
From: uvman <uvman>
Date: Tue, 4 Oct 2005 20:36:42 +0000
Subject: [PATCH] compiler warnings fixes.

---
 ntfsprogs/ntfsclone.c    |  2 +-
 ntfsprogs/ntfscmp.c      |  4 ++--
 ntfsprogs/ntfsfix.c      |  2 +-
 ntfsprogs/ntfsinfo.c     |  8 ++++----
 ntfsprogs/ntfsresize.c   | 18 +++++++++---------
 ntfsprogs/ntfsundelete.c |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ntfsprogs/ntfsclone.c b/ntfsprogs/ntfsclone.c
index 5dfe86b5..6746b748 100644
--- a/ntfsprogs/ntfsclone.c
+++ b/ntfsprogs/ntfsclone.c
@@ -523,7 +523,7 @@ static void copy_cluster(int rescue, u64 rescue_lcn)
 			for (i = 0; i < csize; i += NTFS_SECTOR_SIZE)
 				rescue_sector(fd, rescue_pos + i, buff + i);
 		} else {
-			Printf(bad_sectors_warning_msg);
+			Printf("%s", bad_sectors_warning_msg);
 			err_exit("Disk is faulty, can't make full backup!");
 		}
 	}
diff --git a/ntfsprogs/ntfscmp.c b/ntfsprogs/ntfscmp.c
index 2ada65e4..c915b3b6 100644
--- a/ntfsprogs/ntfscmp.c
+++ b/ntfsprogs/ntfscmp.c
@@ -768,9 +768,9 @@ static ntfs_volume *mount_volume(const char *volume)
 		if (err == EINVAL)
 			printf(invalid_ntfs_msg, volume);
 		else if (err == EIO)
-			printf(corrupt_volume_msg);
+			puts(corrupt_volume_msg);
 		else if (err == EPERM)
-			printf(hibernated_volume_msg);
+			puts(hibernated_volume_msg);
 		exit(1);
 	}
 
diff --git a/ntfsprogs/ntfsfix.c b/ntfsprogs/ntfsfix.c
index 835b07d1..c50377bb 100644
--- a/ntfsprogs/ntfsfix.c
+++ b/ntfsprogs/ntfsfix.c
@@ -93,9 +93,9 @@ struct {
 	char *volume;
 } opt;
 
+static int usage(void) __attribute__((noreturn));
 static int usage(void)
 {
-
 	printf("%s v%s\n"
 		   "\n"
 		   "Usage: %s [options] device\n"
diff --git a/ntfsprogs/ntfsinfo.c b/ntfsprogs/ntfsinfo.c
index f1ada6ce..76af75f0 100644
--- a/ntfsprogs/ntfsinfo.c
+++ b/ntfsprogs/ntfsinfo.c
@@ -475,7 +475,7 @@ static void ntfs_dump_flags(ATTR_TYPES type, u32 flags)
 
 static void ntfs_dump_namespace(u8 file_name_type)
 {
-	const char *mbs_file_type = NULL;
+	const char *mbs_file_type;
 
 	/* name space */
 	switch (file_name_type) {
@@ -491,9 +491,9 @@ static void ntfs_dump_namespace(u8 file_name_type)
 	case FILE_NAME_WIN32_AND_DOS:
 		mbs_file_type = "Win32 & DOS";
 		break;
+	default:
+		mbs_file_type = "(unknown)";
 	}
-	if (mbs_file_type == NULL)      /* should never happen */
-	    mbs_file_type = "(unknown)";
 	printf("\tNamespace:\t\t %s\n", mbs_file_type);
 }
 
@@ -982,7 +982,7 @@ static void ntfs_dump_attr_volume_information(ATTR_RECORD *attr)
 
 	printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance));
 
-	printf("\tVolume Version:\t %d.%d\n", vol_information->major_ver,
+	printf("\tVolume Version:\t\t %d.%d\n", vol_information->major_ver,
 		vol_information->minor_ver);
 	printf("\tFlags:\t\t\t ");
 	if (vol_information->flags & VOLUME_IS_DIRTY)
diff --git a/ntfsprogs/ntfsresize.c b/ntfsprogs/ntfsresize.c
index c2318b90..c50cf231 100644
--- a/ntfsprogs/ntfsresize.c
+++ b/ntfsprogs/ntfsresize.c
@@ -821,7 +821,7 @@ static void build_lcn_usage_bitmap(ntfs_volume *vol, ntfsck_t *fsck)
 		int err = errno;
 		perr_printf("ntfs_decompress_mapping_pairs");
 		if (err == EIO)
-			printf(corrupt_volume_msg);
+			puts(corrupt_volume_msg);
 		exit(1);
 	}
 
@@ -972,7 +972,7 @@ done:
 	if (mismatch) {
 		err_printf("Filesystem check failed! Totally %d cluster "
 			   "accounting mismatches.\n", mismatch);
-		printf(corrupt_volume_msg);
+		puts(corrupt_volume_msg);
 		exit(1);
 	}
 }
@@ -2212,11 +2212,11 @@ static ntfs_volume *mount_volume(void)
 		if (err == EINVAL)
 			printf(invalid_ntfs_msg, opt.volume);
 		else if (err == EIO)
-			printf(corrupt_volume_msg);
+			puts(corrupt_volume_msg);
 		else if (err == EPERM)
-			printf(hibernated_volume_msg);
+			puts(hibernated_volume_msg);
         	else if (err == EOPNOTSUPP)
-			printf(unclean_journal_msg);
+			puts(unclean_journal_msg);
 		exit(1);
 	}
 
@@ -2294,7 +2294,7 @@ static void check_resize_constraints(ntfs_resize_t *resize)
 		       resize->badclusters,
 		       resize->badclusters  - 1 ? "s" : "");
 		if (!opt.badsectors) {
-			printf(bad_sectors_warning_msg);
+			puts(bad_sectors_warning_msg);
 			exit(1);
 		}
 	}
@@ -2398,7 +2398,7 @@ int main(int argc, char **argv)
 		if (fsck.multi_ref)
 			err_printf("%d clusters are referenced multiply"
 				   " times.\n", fsck.multi_ref);
-		printf(corrupt_volume_msg);
+		puts(corrupt_volume_msg);
 		exit(1);
 	}
 	compare_bitmaps(vol, &fsck.lcn_bitmap);
@@ -2427,7 +2427,7 @@ int main(int argc, char **argv)
 	}
 
 	if (opt.force-- <= 0 && !opt.ro_flag) {
-		printf(resize_warning_msg);
+		puts(resize_warning_msg);
 		proceed_question();
 	}
 
@@ -2456,7 +2456,7 @@ int main(int argc, char **argv)
 
 	printf("Successfully resized NTFS on device '%s'.\n", vol->dev->d_name);
 	if (resize.shrink)
-		printf(resize_important_msg);
+		puts(resize_important_msg);
 
 	return 0;
 }
diff --git a/ntfsprogs/ntfsundelete.c b/ntfsprogs/ntfsundelete.c
index acc12661..1a5164cf 100644
--- a/ntfsprogs/ntfsundelete.c
+++ b/ntfsprogs/ntfsundelete.c
@@ -1274,7 +1274,7 @@ static void dump_record (struct ufile *file)
 		if (!(f->flags & (FILE_ATTR_SYSTEM | FILE_ATTR_DIRECTORY |
 		    FILE_ATTR_SPARSE_FILE | FILE_ATTR_REPARSE_POINT |
 		    FILE_ATTR_COMPRESSED | FILE_ATTR_ENCRYPTED))) {
-			Qprintf (NONE);
+			Qprintf ("%s", NONE);
 		}
 
 		Qprintf ("\n");