===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sdiff/sdiff.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- src/usr.bin/sdiff/sdiff.c	2005/12/27 04:46:32	1.9
+++ src/usr.bin/sdiff/sdiff.c	2005/12/27 05:04:27	1.10
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdiff.c,v 1.9 2005/12/27 04:46:32 tedu Exp $ */
+/*	$OpenBSD: sdiff.c,v 1.10 2005/12/27 05:04:27 deraadt Exp $ */
 
 /*
  * Written by Raymond Lai <ray@cyth.net>.
@@ -85,17 +85,11 @@
 main(int argc, char **argv)
 {
 	FILE *difffile, *origfile;
-	size_t argc_max, diffargc, wflag;
+	size_t diffargc = 0, wflag = WIDTH;
 	int ch, fd[2], status;
 	pid_t pid;
-	const char *cmd, **diffargv, *diffprog;
+	const char *cmd, **diffargv, *diffprog = "diff";
 
-	/* Initialize variables. */
-	diffargc = 0;
-	diffprog = "diff";
-	outfile = NULL;
-	wflag = WIDTH;
-
 	/*
 	 * Process diff flags.
 	 */
@@ -107,8 +101,7 @@
 	 * waste some memory; however we need an extra space for the
 	 * NULL at the end, so it sort of works out.
 	 */
-	argc_max = argc * 2;
-	if (!(diffargv = malloc(sizeof(char **) * argc_max)))
+	if (!(diffargv = malloc(sizeof(char **) * argc * 2)))
 		err(2, "main");
 
 	/* Add first argument, the program name. */