svn commit: r306217 - in stable/9/usr.bin/bsdiff: bsdiff bspatch

[Ed Maste]

Author: emaste
Date: Thu Sep 22 21:23:28 2016
New Revision: 306217
URL: https://svnweb.freebsd.org/changeset/base/306217

Log:
  MFC r264823 (ed): Make usage printing more consistent with other tools.
  
  - Introduce a separate usage() function.
  - Don't use argv[0]. Directly name the application, as we do elsewhere.
  - Don't prepend the application name.
  - Don't print two newlines.
  
  Also apply the unnecessary semicolon cleanup from r298089

Modified:
  stable/9/usr.bin/bsdiff/bsdiff/bsdiff.c
  stable/9/usr.bin/bsdiff/bspatch/bspatch.c
Directory Properties:
  stable/9/usr.bin/bsdiff/   (props changed)

Modified: stable/9/usr.bin/bsdiff/bsdiff/bsdiff.c
==============================================================================
--- stable/9/usr.bin/bsdiff/bsdiff/bsdiff.c	Thu Sep 22 21:19:25 2016	(r306216)
+++ stable/9/usr.bin/bsdiff/bsdiff/bsdiff.c	Thu Sep 22 21:23:28 2016	(r306217)
@@ -196,6 +196,14 @@ static void offtout(off_t x,u_char *buf)
 	if(x<0) buf[7]|=0x80;
 }
 
+static void
+usage(void)
+{
+
+	fprintf(stderr, "usage: bsdiff oldfile newfile patchfile\n");
+	exit(1);
+}
+
 int main(int argc,char *argv[])
 {
 	int fd;
@@ -216,7 +224,8 @@ int main(int argc,char *argv[])
 	BZFILE * pfbz2;
 	int bz2err;
 
-	if(argc!=4) errx(1,"usage: %s oldfile newfile patchfile\n",argv[0]);
+	if (argc != 4)
+		usage();
 
 	/* Allocate oldsize+1 bytes instead of oldsize bytes to ensure
 		that we never try to malloc(0) and get a NULL pointer */

Modified: stable/9/usr.bin/bsdiff/bspatch/bspatch.c
==============================================================================
--- stable/9/usr.bin/bsdiff/bspatch/bspatch.c	Thu Sep 22 21:19:25 2016	(r306216)
+++ stable/9/usr.bin/bsdiff/bspatch/bspatch.c	Thu Sep 22 21:23:28 2016	(r306217)
@@ -57,6 +57,14 @@ static off_t offtin(u_char *buf)
 	return y;
 }
 
+static void
+usage(void)
+{
+
+	fprintf(stderr, "usage: bspatch oldfile newfile patchfile\n");
+	exit(1);
+}
+
 int main(int argc,char * argv[])
 {
 	FILE * f, * cpf, * dpf, * epf;
@@ -72,7 +80,8 @@ int main(int argc,char * argv[])
 	off_t lenread;
 	off_t i;
 
-	if(argc!=4) errx(1,"usage: %s oldfile newfile patchfile\n",argv[0]);
+	if (argc != 4)
+		usage();
 
 	/* Open patch file */
 	if ((f = fopen(argv[3], "rb")) == NULL)
@@ -152,7 +161,7 @@ int main(int argc,char * argv[])
 			    (cbz2err != BZ_STREAM_END)))
 				errx(1, "Corrupt patch\n");
 			ctrl[i]=offtin(buf);
-		};
+		}
 
 		/* Sanity-check */
 		if ((ctrl[0] < 0) || (ctrl[1] < 0))
@@ -190,7 +199,7 @@ int main(int argc,char * argv[])
 		/* Adjust pointers */
 		newpos+=ctrl[1];
 		oldpos+=ctrl[2];
-	};
+	}
 
 	/* Clean up the bzip2 reads */
 	BZ2_bzReadClose(&cbz2err, cpfbz2);