update a comment.

diff --git a/configure.in b/configure.in
index edb91c16526d6112f5edf469e9dba00f2480c183..4faec7603336ce2c647fcde5086341e3c38f4036 100644 (file)
--- 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 22c3b021c66e7374ae5791e3a10bd17b1bf9a83a..0d333d5ec5dfcfaba28ca31ea2772de25f794a83 100644 (file)
--- 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 b3aa011c2e9a9e7bdd3975cbfb2aaaa144a8d953..33105811742b709cfd60d0ae7fe32366fd88564f 100644 (file)
--- 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 49d3722d7e76e4d9e87c3a540ba040c773147e46..a154867804cd18441805e06230856b37bd792ac0 100644 (file)
--- 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 17a8d8c79f428009b074e8c0db3fd99f72065593..7090591f60fc4fd98ed17f5c51440566b648395f 100644 (file)
--- 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 3615b8596f838058690e056b6a69b009ebbba357..c77d0ef3c8576d89895cba62cc5266201fd1222d 100644 (file)
--- 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 43011624ff6c33996630f012310bfffe85e9f4a8..28f895f87ad0204cc2a63f5ea8f3103bcb1d9322 100644 (file)
--- 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 edcb31dcb1fd60480b45e7742f919b1794e5883d..14c43031e1d17750544dd287e272722694268ddd 100644 (file)
--- 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 f3ca762f6b3e97b47b884a7184d82cd1b8023d87..acf439115bc616949baf1091c15a355ecbf4f2ca 100644 (file)
--- 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 d13ff7d67d9e96a20b7e130c922c96cd19bb297b..6cf266bfb7de80f8dbd4fe4612fef13947015e28 100644 (file)
--- 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 465399812c88c2f8f0a29d95af163b11eb19cddf..9e7b80f06d23a9c20f50bcbb4ea8aaeddb87660e 100644 (file)
--- 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 3a8f4db5e84d7b1161ce6ba2acd62adbcdbe857b..7f441ec66e4ed2f68451e2606c75833d279e5d5b 100644 (file)
--- 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 e5fcde9d69ae37c7c7ee4d12006b14c2045bea24..abf038b28b3c9c7e8f9a4b6479b0c7cfb739409b 100644 (file)
--- 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;