From: Nathan Scott <nathans@sgi.com>
Date: Wed, 9 May 2001 07:03:16 +0000 (+0000)
Subject: update a comment.
X-Git-Tag: v1.1.0~1257
X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=a777d6221eb64e9828378e7572e6fd8a3c50383a

update a comment.
---

diff --git a/configure.in b/configure.in
index edb91c16..4faec760 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ AC_SUBST(pkg_name)
 #
 
 DEBUG=${DEBUG:-'-DDEBUG'}		# -DNDEBUG
-OPTIMIZER=${OPTIMIZER:-'-g'}		# -O2
+OPTIMIZER=${OPTIMIZER:-'-g'}		# (-O1 enforced default)
 MALLOCLIB=${MALLOCLIB:-''}		# /usr/lib/libefence.a
 
 dnl Debug build?
diff --git a/include/builddefs.in b/include/builddefs.in
index 22c3b021..0d333d5e 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -69,9 +69,9 @@ PKG_DOC_DIR = @pkg_doc_dir@
 # $(CXXFILES), or $(HFILES) and is used to construct the manifest list
 # during the "dist" phase (packaging).
 
-CFLAGS += $(OPTIMIZER) $(DEBUG) -funsigned-char -Wall -Wno-parentheses \
-	$(LCFLAGS) -I$(TOPDIR)/include '-DVERSION="$(PKG_VERSION)"' \
-	-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+CFLAGS += -O1 $(OPTIMIZER) $(DEBUG) -funsigned-char -Wall $(LCFLAGS) \
+	-I$(TOPDIR)/include '-DVERSION="$(PKG_VERSION)"' -D_GNU_SOURCE \
+	-D_FILE_OFFSET_BITS=64
 
 LDFLAGS = $(LLDFLAGS)
 LDLIBS = $(LLDLIBS) $(MALLOCLIB)
diff --git a/src/bstat.c b/src/bstat.c
index b3aa011c..33105811 100644
--- a/src/bstat.c
+++ b/src/bstat.c
@@ -32,9 +32,6 @@
 
 #include <libxfs.h>
 #include <jdm.h>
-
-#include <errno.h>
-#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 
@@ -97,7 +94,7 @@ main(int argc, char **argv)
 	int		verbose = 0;
 	xfs_bstat_t	*t;
 	int		ret;
-	jdm_fshandle_t	*fshandlep;
+	jdm_fshandle_t	*fshandlep = NULL;
 	int		fd;
 	struct stat64	sb;
 	int nread;
diff --git a/src/devzero.c b/src/devzero.c
index 49d3722d..a1548678 100644
--- a/src/devzero.c
+++ b/src/devzero.c
@@ -31,9 +31,7 @@
  */
 
 #include <libxfs.h>
-#include <fcntl.h>
 #include <malloc.h>
-#include <errno.h>
 
 int
 main(int argc, char **argv)
diff --git a/src/fault.c b/src/fault.c
index 17a8d8c7..7090591f 100644
--- a/src/fault.c
+++ b/src/fault.c
@@ -31,9 +31,6 @@
  */
 
 #include <libxfs.h>
-
-#include <errno.h>
-#include <fcntl.h>
 #include <sys/ioctl.h>
 
 void expect_error(int r, int err)
diff --git a/src/fill2.c b/src/fill2.c
index 3615b859..c77d0ef3 100644
--- a/src/fill2.c
+++ b/src/fill2.c
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
  * 
@@ -117,24 +116,24 @@ main(int argc, char **argv)
     char		*p;		/* for getsubopt calls */
     long		nbytes;		/* total number of bytes to write */
     int			dlen;		/* length of normal output data line */
-    const char		*dseed;		/* input string for seeding rand */
+    const char		*dseed = NULL;	/* input string for seeding rand */
     unsigned int	seed;		/* seed for output data */    
-    char		*dfile;		/* where to write output */
+    char		*dfile = NULL;	/* where to write output */
 
     FILE		*f;		/* output file */
     char		*dbuf;		/* output line buffer */
     char		bbuf[50];	/* block boundary string */
-    char		*active;	/* active buffer to copy out of */
+    char		*active = NULL;	/* active buffer to copy out of */
     size_t		hlen;		/* header length (bytes+key) in output */
 					/* lines */
     char		*hptr;		/* pointer to end of header */
     char		*ptr;		/* current position to copy from */
-    int			blktype;	/* current block boundary type */
+    int			blktype = 0;	/* current block boundary type */
     int			boundary;	/* set if current output char lies on */
 					/* block boundary */
     long		i;
     int			j;
-    int			l;
+    int			l = 0;
 
 
     /* defaults */
diff --git a/src/global.h b/src/global.h
index 43011624..28f895f8 100644
--- a/src/global.h
+++ b/src/global.h
@@ -33,28 +33,19 @@
 #ifndef GLOBAL_H
 #define GLOBAL_H
 
-/* includes */
+/* xfs-specific includes */
+
+#include <libxfs.h>
+#include <attributes.h>
+
+/* libc includes */
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/fcntl.h>
 #include <sys/stat.h>
 #include <sys/statvfs.h>
-#include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>
-#include <getopt.h>
 #include <malloc.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
 #include <dirent.h>
 
-/* xfs specific includes */
-
-#include <libxfs.h>
-#include <attributes.h>
-
 #endif
diff --git a/src/holes.c b/src/holes.c
index edcb31dc..14c43031 100644
--- a/src/holes.c
+++ b/src/holes.c
@@ -54,7 +54,7 @@ main(int argc, char *argv[])
 {
 	int interleave, blocksize, count, rev, i, ch, fd;
 	long filesize;
-	char *filename;
+	char *filename = NULL;
         int errs;
 
 	filesize = 1024*1024;
diff --git a/src/ioctl.c b/src/ioctl.c
index f3ca762f..acf43911 100644
--- a/src/ioctl.c
+++ b/src/ioctl.c
@@ -32,9 +32,6 @@
 
 #include <libxfs.h>
 #include <jdm.h>
-
-#include <errno.h>
-#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 
diff --git a/src/loggen.c b/src/loggen.c
index d13ff7d6..6cf266bf 100644
--- a/src/loggen.c
+++ b/src/loggen.c
@@ -41,9 +41,6 @@
 
 #include <libxfs.h>
 #include <malloc.h>
-#include <errno.h>
-#include <fcntl.h>
-
 #include <xfs_log.h>
 #include <xfs_log_priv.h>
 
diff --git a/src/nametest.c b/src/nametest.c
index 46539981..9e7b80f0 100644
--- a/src/nametest.c
+++ b/src/nametest.c
@@ -105,7 +105,7 @@ main(int argc, char *argv[])
 {
 	char *sourcefile, *c;
 	int totalnames, iterations, zeroout;
-	int zone, op, pct_remove, pct_create, ch, i, retval, fd;
+	int zone, op, pct_remove=0, pct_create=0, ch, i, retval, fd;
 	struct stat64 statb;
 	struct info *ip;
 	int seed, linedots;
diff --git a/src/randholes.c b/src/randholes.c
index 3a8f4db5..7f441ec6 100644
--- a/src/randholes.c
+++ b/src/randholes.c
@@ -72,7 +72,7 @@ int
 main(int argc, char *argv[])
 {
 	int seed, ch, fd, oflags;
-	char *filename;
+	char *filename = NULL;
         int r;
 
 	filesize = ((off64_t)256)*1024*1024;
diff --git a/src/truncfile.c b/src/truncfile.c
index e5fcde9d..abf038b2 100644
--- a/src/truncfile.c
+++ b/src/truncfile.c
@@ -54,7 +54,7 @@ int
 main(int argc, char *argv[])
 {
 	int seed, i, ch, fd;
-	char *filename;
+	char *filename = NULL;
 
 	filesize = 256*1024*1024;
 	blocksize = 512;