[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools ntfsundelete.c,1.20,1.21

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv5255

Modified Files:
	ntfsundelete.c 
Log Message:
minor build fixes


Index: ntfsundelete.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsundelete.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -U2 -r1.20 -r1.21
--- ntfsundelete.c	18 Jul 2002 02:44:32 -0000	1.20
+++ ntfsundelete.c	19 Jul 2002 14:57:03 -0000	1.21
@@ -454,5 +454,5 @@
 		{ "verbose",	 no_argument,		NULL, 'v' },
 		{ "version",	 no_argument,		NULL, 'V' },
-		{ NULL }
+		{ NULL, 0, NULL, 0 }
 	};
 
@@ -482,4 +482,5 @@
 		case 'b':
 			if (opts.fillbyte == -1) {
+				end = NULL;
 				opts.fillbyte = strtol (optarg, &end, 0);
 				if (end && *end)
@@ -530,4 +531,5 @@
 		case 'p':
 			if (opts.percent == -1) {
+				end = NULL;
 				opts.percent = strtol (optarg, &end, 0);
 				if (end && ((*end != '%') && (*end != 0)))
@@ -563,4 +565,5 @@
 		case 'u':
 			if (opts.mode == MODE_NONE) {
+				end = NULL;
 				opts.mode = MODE_UNDELETE;
 				opts.uinode = strtol (optarg, &end, 0);
@@ -592,5 +595,7 @@
 	}
 
-	if (!help && !ver) {
+	if (help || ver) {
+		opts.quiet = 0;
+	} else {
 		if (opts.device == NULL) {
 			Eprintf ("You must specify exactly one device.\n");
@@ -656,5 +661,5 @@
 		usage();
 
-	return ((err == 0) && !help && !ver);
+	return (!err && !help && !ver);
 }
 
@@ -1422,5 +1427,5 @@
  *           0  Success, all the data was written
  */
-int write_data (int fd, const char *buffer, int bufsize)
+unsigned int write_data (int fd, const char *buffer, unsigned int bufsize)
 {
 	ssize_t result1, result2;
@@ -1432,5 +1437,5 @@
 
 	result1 = write (fd, buffer, bufsize);
-	if ((result1 == bufsize) || (result1 < 0))
+	if ((result1 == (ssize_t) bufsize) || (result1 < 0))
 		return result1;