Doxygen and cpp nit picks.

CVS patchset: 7443
CVS date: 2004/10/09 21:58:33

diff --git a/Doxyfile.in b/Doxyfile.in
index 804992b..4353593 100644 (file)
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -383,79 +383,6 @@ INPUT                  = @top_srcdir@/Doxyheader \
                          @top_srcdir@/rpmrc \
                          @top_srcdir@/rpm2cpio.c \
                          @top_srcdir@/system.h \
-                         @top_srcdir@/beecrypt/aes.c \
-                         @top_srcdir@/beecrypt/aes.h \
-                         @top_srcdir@/beecrypt/aesopt.h \
-                         @top_srcdir@/beecrypt/base64.c \
-                         @top_srcdir@/beecrypt/base64.h \
-                         @top_srcdir@/beecrypt/beecrypt.c \
-                         @top_srcdir@/beecrypt/beecrypt.h \
-                         @top_srcdir@/beecrypt/beecrypt.api.h \
-                         @top_srcdir@/beecrypt/beecrypt.gnu.h \
-                         @top_srcdir@/beecrypt/blockmode.c \
-                         @top_srcdir@/beecrypt/blockmode.h \
-                         @top_srcdir@/beecrypt/blockpad.c \
-                         @top_srcdir@/beecrypt/blockpad.h \
-                         @top_srcdir@/beecrypt/blowfish.c \
-                         @top_srcdir@/beecrypt/blowfish.h \
-                         @top_srcdir@/beecrypt/blowfishopt.h \
-                         @top_srcdir@/beecrypt/config.h \
-                         @top_srcdir@/beecrypt/dhaes.c \
-                         @top_srcdir@/beecrypt/dhaes.h \
-                         @top_srcdir@/beecrypt/dldp.c \
-                         @top_srcdir@/beecrypt/dldp.h \
-                         @top_srcdir@/beecrypt/dlkp.c \
-                         @top_srcdir@/beecrypt/dlkp.h \
-                         @top_srcdir@/beecrypt/dlpk.c \
-                         @top_srcdir@/beecrypt/dlpk.h \
-                         @top_srcdir@/beecrypt/dlsvdp-dh.c \
-                         @top_srcdir@/beecrypt/dlsvdp-dh.h \
-                         @top_srcdir@/beecrypt/elgamal.c \
-                         @top_srcdir@/beecrypt/elgamal.h \
-                         @top_srcdir@/beecrypt/endianness.c \
-                         @top_srcdir@/beecrypt/endianness.h \
-                         @top_srcdir@/beecrypt/entropy.c \
-                         @top_srcdir@/beecrypt/entropy.h \
-                         @top_srcdir@/beecrypt/fips186.c \
-                         @top_srcdir@/beecrypt/fips186.h \
-                         @top_srcdir@/beecrypt/hmac.c \
-                         @top_srcdir@/beecrypt/hmac.h \
-                         @top_srcdir@/beecrypt/hmacmd5.c \
-                         @top_srcdir@/beecrypt/hmacmd5.h \
-                         @top_srcdir@/beecrypt/hmacsha1.c \
-                         @top_srcdir@/beecrypt/hmacsha1.h \
-                         @top_srcdir@/beecrypt/hmacsha256.c \
-                         @top_srcdir@/beecrypt/hmacsha256.h \
-                         @top_srcdir@/beecrypt/java/javaglue.c \
-                         @top_srcdir@/beecrypt/java/javaglue.h \
-                         @top_srcdir@/beecrypt/md5.c \
-                         @top_srcdir@/beecrypt/md5.h \
-                         @top_srcdir@/beecrypt/memchunk.c \
-                         @top_srcdir@/beecrypt/memchunk.h \
-                         @top_srcdir@/beecrypt/mpbarrett.c \
-                         @top_srcdir@/beecrypt/mpbarrett.h \
-                         @top_srcdir@/beecrypt/mp.c \
-                         @top_srcdir@/beecrypt/mp.h \
-                         @top_srcdir@/beecrypt/mpnumber.c \
-                         @top_srcdir@/beecrypt/mpnumber.h \
-                         @top_srcdir@/beecrypt/mpopt.h \
-                         @top_srcdir@/beecrypt/mpprime.c \
-                         @top_srcdir@/beecrypt/mpprime.h \
-                         @top_srcdir@/beecrypt/mtprng.c \
-                         @top_srcdir@/beecrypt/mtprng.h \
-                         @top_srcdir@/beecrypt/rsa.c \
-                         @top_srcdir@/beecrypt/rsa.h \
-                         @top_srcdir@/beecrypt/rsakp.c \
-                         @top_srcdir@/beecrypt/rsakp.h \
-                         @top_srcdir@/beecrypt/rsapk.c \
-                         @top_srcdir@/beecrypt/rsapk.h \
-                         @top_srcdir@/beecrypt/sha1.c \
-                         @top_srcdir@/beecrypt/sha1.h \
-                         @top_srcdir@/beecrypt/sha1opt.h \
-                         @top_srcdir@/beecrypt/sha256.c \
-                         @top_srcdir@/beecrypt/sha256.h \
-                         @top_srcdir@/beecrypt/timestamp.c \
-                         @top_srcdir@/beecrypt/timestamp.h \
                          @top_srcdir@/build/build.c \
                          @top_srcdir@/build/buildio.h \
                          @top_srcdir@/build/expression.c \
@@ -635,36 +562,13 @@ INPUT                  = @top_srcdir@/Doxyheader \
                          @top_srcdir@/tools/dump.c \
                          @top_srcdir@/tools/dumpdb.c \
                          @top_srcdir@/tools/javadeps.c \
-                         @top_srcdir@/tools/rpmarchive.c \
                          @top_srcdir@/tools/rpmcache.c \
                          @top_srcdir@/tools/rpmdeps.c \
                          @top_srcdir@/tools/rpmgraph.c \
-                         @top_srcdir@/tools/rpmheader.c \
                          @top_srcdir@/tools/rpminject.c \
-                         @top_srcdir@/tools/rpmlead.c \
-                         @top_srcdir@/tools/rpmsignature.c \
-                         @top_srcdir@/zlib/adler32.c \
-                         @top_srcdir@/zlib/crc32.c \
-                         @top_srcdir@/zlib/crc32.h \
-                         @top_srcdir@/zlib/deflate.c \
-                         @top_srcdir@/zlib/deflate.h \
-                         @top_srcdir@/zlib/gzio.c \
-                         @top_srcdir@/zlib/infback.c \
-                         @top_srcdir@/zlib/inffast.c \
-                         @top_srcdir@/zlib/inffast.h \
-                         @top_srcdir@/zlib/inffixed.h \
-                         @top_srcdir@/zlib/inflate.c \
-                         @top_srcdir@/zlib/inflate.h \
-                         @top_srcdir@/zlib/inftrees.c \
-                         @top_srcdir@/zlib/inftrees.h \
-                         @top_srcdir@/zlib/minigzip.c \
-                         @top_srcdir@/zlib/trees.c \
-                         @top_srcdir@/zlib/trees.h \
-                         @top_srcdir@/zlib/uncompr.c \
-                         @top_srcdir@/zlib/zconf.h \
-                         @top_srcdir@/zlib/zlib.h \
-                         @top_srcdir@/zlib/zutil.c \
-                         @top_srcdir@/zlib/zutil.h
+                         @top_srcdir@/tools/rpmtool.c \
+                         @top_srcdir@/tools/rpmxml.c \
+                         @top_srcdir@/tools/rpmxp.c
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 

diff --git a/build/files.c b/build/files.c
index 11b9504..d95d3ab 100644 (file)
--- a/build/files.c
+++ b/build/files.c
@@ -1739,6 +1739,7 @@ static int recurseDir(FileList fl, const char * diskURL)
  * @param pkg
  * @param fl           package file tree walk data
  * @param fileURL      path to file, relative is builddir, absolute buildroot.
+ * @param tag          tag to add
  * @return             0 on success
  */
 static int processMetadataFile(Package pkg, FileList fl, const char * fileURL,

diff --git a/build/rpmbuild.h b/build/rpmbuild.h
index 31fc66c..5652ded 100644 (file)
--- a/build/rpmbuild.h
+++ b/build/rpmbuild.h
@@ -303,7 +303,7 @@ int parsePrep(Spec spec)
  * @param spec         spec file control structure
  * @param pkg          package control structure
  * @param field                text to parse (e.g. "foo < 0:1.2-3, bar = 5:6.7")
- * @param tag          tag, identifies type of dependency
+ * @param tagN         tag, identifies type of dependency
  * @param index                (0 always)
  * @param tagflags     dependency flags already known from context
  * @return             0 on success, RPMERR_BADSPEC on failure

diff --git a/file/autogen.sh b/file/autogen.sh
index 59215d1..b9b17dd 100755 (executable)
--- a/file/autogen.sh
+++ b/file/autogen.sh
@@ -5,12 +5,12 @@ export LDFLAGS
 
 LTV="libtoolize (GNU libtool) 1.5.6"
 ACV="autoconf (GNU Autoconf) 2.59"
-AMV="automake (GNU automake) 1.9"
+AMV="automake (GNU automake) 1.9.2"
 USAGE="
 This script documents the versions of the tools I'm using to build rpm:
        libtool-1.5.6
        autoconf-2.59
-       automake-1.9
+       automake-1.9.2
 Simply edit this script to change the libtool/autoconf/automake versions
 checked if you need to, as rpm should build (and has built) with all
 recent versions of libtool/autoconf/automake.

diff --git a/lib/psm.c b/lib/psm.c
index 4d93bdf..3b31268 100644 (file)
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -646,7 +646,6 @@ static rpmRC runLuaScript(rpmpsm psm, Header h, const char *sln,
        xx = rpmtsSetChrootDone(ts, 0);
     }
 
-exit:
     return rc;
 }
 

diff --git a/lib/query.c b/lib/query.c
index 33569d5..d16bd6b 100644 (file)
--- a/lib/query.c
+++ b/lib/query.c
@@ -707,7 +707,7 @@ restart:
                fn = xstrdup(arg);
        } else if (*arg != '/') {
            const char *curDir = currentDirectory();
-           fn = rpmGetPath(curDir, "/", arg, NULL);
+           fn = (char *) rpmGetPath(curDir, "/", arg, NULL);
            curDir = _free(curDir);
        } else
            fn = xstrdup(arg);

diff --git a/lib/rpmds.h b/lib/rpmds.h
index 1ffa756..96a275c 100644 (file)
--- a/lib/rpmds.h
+++ b/lib/rpmds.h
@@ -230,6 +230,7 @@ time_t rpmdsBT(/*@null@*/ const rpmds ds)
 /**
  * Set dependency build time.
  * @param ds           dependency set
+ * @param BT           build time
  * @return             dependency build time, 0 on invalid
  */
 time_t rpmdsSetBT(/*@null@*/ const rpmds ds, time_t BT)

diff --git a/lua/local/linit.c b/lua/local/linit.c
index 79bfeac..2278f13 100644 (file)
--- a/lua/local/linit.c
+++ b/lua/local/linit.c
@@ -4,4 +4,5 @@
 LUA_API int luaopen_init(lua_State *L)
 {
 #include "linit.lch"
+    return 0;
 }

diff --git a/lua/local/lrexlib.c b/lua/local/lrexlib.c
index 8486330..46bfa4d 100644 (file)
--- a/lua/local/lrexlib.c
+++ b/lua/local/lrexlib.c
@@ -127,7 +127,7 @@ static int rex_gmatch(lua_State *L)
 #ifdef REG_BASIC
   size_t len;
 #endif
-  size_t ncapt, nmatch = 0, maxmatch, limit = 0;
+  size_t ncapt, nmatch = 0, maxmatch = 0, limit = 0;
   const char *text;
   regex_t *pr;
   regmatch_t *match;

diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c
index 9401395..01e8f21 100644 (file)
--- a/python/rpmfi-py.c
+++ b/python/rpmfi-py.c
@@ -136,8 +136,9 @@ rpmfi_MD5(rpmfiObject * s, PyObject * args)
 
     if (!PyArg_ParseTuple(args, ":MD5")) return NULL;
     MD5 = rpmfiMD5(s->fi);
+    t = fmd5;
     if (MD5 != NULL)
-    for (i = 0, t = fmd5; i < 16; i++, t += 2)
+    for (i = 0; i < 16; i++, t += 2)
        sprintf(t, "%02x", MD5[i]);
     *t = '\0';
     return Py_BuildValue("s", xstrdup(fmd5));