Typos.

CVS patchset: 4837
CVS date: 2001/06/05 20:39:35

diff --git a/build/files.c b/build/files.c
index 930989e..4663591 100644 (file)
--- a/build/files.c
+++ b/build/files.c
@@ -2117,8 +2117,8 @@ top:
 /**
  */
 typedef struct {
-/*@observer@*/ /*@null@*/ const char *msg;
-/*@observer@*/ /*@null@*/ const char *argv[4];
+/*@observer@*/ /*@null@*/ const char * msg;
+/*@observer@*/ const char * argv[4];
     int ntag;
     int vtag;
     int ftag;
@@ -2304,7 +2304,7 @@ static void printDepMsg(DepMsg_t * dm, int count, const char ** names,
        if (hasFlags && !((*flags & dm->mask) ^ dm->xor))
            continue;
        if (bingo == 0) {
-           rpmMessage(RPMMESS_NORMAL, "%s:", dm->msg);
+           rpmMessage(RPMMESS_NORMAL, "%s:", (dm->msg ? dm->msg : ""));
            bingo = 1;
        }
        rpmMessage(RPMMESS_NORMAL, " %s", *names);

diff --git a/rpmdb/.cvsignore b/rpmdb/.cvsignore
index cd60227..85d4b83 100644 (file)
--- a/rpmdb/.cvsignore
+++ b/rpmdb/.cvsignore
@@ -1,5 +1,6 @@
 .deps
 .depend
+.created
 Makefile
 Makefile.in
 .libs

diff --git a/rpmdb/db3.c b/rpmdb/db3.c
index b9b7d69..855e12c 100644 (file)
--- a/rpmdb/db3.c
+++ b/rpmdb/db3.c
@@ -1084,7 +1084,9 @@ static int db3open(/*@keep@*/ rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
            _printit = (rc > 0 ? 0 : _debug);
            xx = cvtdberr(dbi, "db->open", rc, _printit);
 
-           if (rc == 0 && dbi->dbi_use_dbenv && (dbi->dbi_eflags & DB_INIT_CDB) && dbi->dbi_get_rmw_cursor) {
+           if (rc == 0 && dbi->dbi_use_dbenv
+           && (dbi->dbi_eflags & DB_INIT_CDB) && dbi->dbi_get_rmw_cursor)
+           {
                DBC * dbcursor = NULL;
                xx = db->cursor(db, txnid, &dbcursor,
                        ((oflags & DB_RDONLY) ? 0 : DB_WRITECURSOR));

diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c
index ab64706..dd2514a 100644 (file)
--- a/rpmdb/dbconfig.c
+++ b/rpmdb/dbconfig.c
@@ -249,7 +249,9 @@ struct dbOption rdbOptions[] = {
 };
 /*@=immediatetrans =exportlocal =exportheadervar@*/
 
-static int dbSaveLong(const struct dbOption * opt, int argInfo, long aLong) {
+static int dbSaveLong(const struct dbOption * opt, int argInfo, long aLong)
+       /*@modifies opt->arg @*/
+{
     if (argInfo & POPT_ARGFLAG_NOT)
        aLong = ~aLong;
     if (opt->arg != NULL)
@@ -273,7 +275,9 @@ static int dbSaveLong(const struct dbOption * opt, int argInfo, long aLong) {
     return 0;
 }
 
-static int dbSaveInt(const struct dbOption * opt, int argInfo, long aLong) {
+static int dbSaveInt(const struct dbOption * opt, int argInfo, long aLong)
+       /*@modifies opt->arg @*/
+{
     if (argInfo & POPT_ARGFLAG_NOT)
        aLong = ~aLong;
     if (opt->arg != NULL)
@@ -297,7 +301,8 @@ static int dbSaveInt(const struct dbOption * opt, int argInfo, long aLong) {
     return 0;
 }
 
-dbiIndex db3Free(dbiIndex dbi) {
+dbiIndex db3Free(dbiIndex dbi)
+{
     if (dbi) {
        dbi->dbi_root = _free(dbi->dbi_root);
        dbi->dbi_home = _free(dbi->dbi_home);
@@ -344,6 +349,8 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag)
     if (dbOpts && *dbOpts && *dbOpts != '%') {
        char *o, *oe;
        char *p, *pe;
+
+       memset(&db3dbi, 0, sizeof(db3dbi));
        for (o = dbOpts; o && *o; o = oe) {
            struct dbOption *opt;
            const char * tok;
@@ -452,10 +459,10 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag)
 
     dbOpts = _free(dbOpts);
 
-    memset(&db3dbi, 0, sizeof(db3dbi));
     /*@-assignexpose@*/
     *dbi = db3dbi;     /* structure assignment */
     /*@=assignexpose@*/
+    memset(&db3dbi, 0, sizeof(db3dbi));
 
     if (!(dbi->dbi_perms & 0600))
        dbi->dbi_perms = 0644;