Replace all uses of RPMMESS_DEBUG with RPMLOG_DEBUG

diff --git a/build/rpmfc.c b/build/rpmfc.c
index 996f261..2f69e6b 100644 (file)
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -113,7 +113,7 @@ static StringBuf getOutputFrom(const char * dir, ARGV_t argv,
            (void) chdir(dir);
        }
        
-       rpmlog(RPMMESS_DEBUG, _("\texecv(%s) pid %d\n"),
+       rpmlog(RPMLOG_DEBUG, _("\texecv(%s) pid %d\n"),
                         argv[0], (unsigned)getpid());
 
        unsetenv("MALLOC_CHECK_");
@@ -206,7 +206,7 @@ top:
 
     /* Collect status from prog */
     reaped = waitpid(child, &status, 0);
-    rpmlog(RPMMESS_DEBUG, _("\twaitpid(%d) rc %d status %x\n"),
+    rpmlog(RPMLOG_DEBUG, _("\twaitpid(%d) rc %d status %x\n"),
         (unsigned)child, (unsigned)reaped, status);
 
     if (failNonZero && (!WIFEXITED(status) || WEXITSTATUS(status))) {
@@ -1292,7 +1292,7 @@ assert(ftype != NULL);    /* XXX figger a proper return path. */
        }
 
        se = ftype;
-        rpmlog(RPMMESS_DEBUG, "%s: %s\n", s, se);
+        rpmlog(RPMLOG_DEBUG, "%s: %s\n", s, se);
 
        /* Save the path. */
        xx = argvAdd(&fc->fn, s);

diff --git a/lib/depends.c b/lib/depends.c
index 4b85f97..c8470c3 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -340,7 +340,7 @@ addheader:
                if (rpmVersionCompare(h, oh))
 #endif
                    xx = removePackage(ts, oh, rpmdbGetIteratorOffset(mi), pkgKey);
-               rpmlog(RPMMESS_DEBUG, _("  Obsoletes: %s\t\terases %s\n"),
+               rpmlog(RPMLOG_DEBUG, _("  Obsoletes: %s\t\terases %s\n"),
                        rpmdsDNEVR(obsoletes)+2, ohNEVRA);
                ohNEVRA = _free(ohNEVRA);
            }
@@ -759,7 +759,7 @@ static int ignoreDep(const rpmts ts, const rpmte p, const rpmte q)
        char * s = rpmExpand("%{?_dependency_whiteout}", NULL);
        const char ** av = NULL;
        int msglvl = (rpmtsFlags(ts) & RPMTRANS_FLAG_DEPLOOPS)
-                       ? RPMMESS_WARNING : RPMMESS_DEBUG;
+                       ? RPMMESS_WARNING : RPMLOG_DEBUG;
        int ac = 0;
        int i;
 
@@ -1104,7 +1104,7 @@ int rpmtsOrder(rpmts ts)
     pi = rpmtsiFree(pi);
 
     /* Record all relations. */
-    rpmlog(RPMMESS_DEBUG, _("========== recording tsort relations\n"));
+    rpmlog(RPMLOG_DEBUG, _("========== recording tsort relations\n"));
     pi = rpmtsiInit(ts);
     while ((p = rpmtsiNext(pi, oType)) != NULL) {
 
@@ -1196,7 +1196,7 @@ int rpmtsOrder(rpmts ts)
     ts->ntrees = treex;
 
     /* T4. Scan for zeroes. */
-    rpmlog(RPMMESS_DEBUG, _("========== tsorting packages (order, #predecessors, #succesors, tree, depth, breadth)\n"));
+    rpmlog(RPMLOG_DEBUG, _("========== tsorting packages (order, #predecessors, #succesors, tree, depth, breadth)\n"));
 
 rescan:
     if (pi != NULL) pi = rpmtsiFree(pi);
@@ -1239,7 +1239,7 @@ rescan:
        breadth = ((depth < npeer) ? peer[depth]++ : 0);
        (void) rpmteSetBreadth(q, breadth);
 
-       rpmlog(RPMMESS_DEBUG, "%5d%5d%5d%5d%5d%5d %*s%c%s\n",
+       rpmlog(RPMLOG_DEBUG, "%5d%5d%5d%5d%5d%5d %*s%c%s\n",
                        orderingCount, rpmteNpreds(q),
                        rpmteTSI(q)->tsi_qcnt,
                        treex, depth, breadth,
@@ -1286,7 +1286,7 @@ rescan:
        if (!_printed && loopcheck == qlen && rpmteTSI(q)->tsi_suc != NULL) {
            _printed++;
            (void) rpmtsUnorderedSuccessors(ts, orderingCount);
-           rpmlog(RPMMESS_DEBUG,
+           rpmlog(RPMLOG_DEBUG,
                _("========== successors only (%d bytes)\n"), (int)tsbytes);
 
            /* Relink the queue in presentation order. */
@@ -1353,7 +1353,7 @@ rescan:
                const char * dp;
                char buf[4096];
                int msglvl = (rpmtsFlags(ts) & RPMTRANS_FLAG_DEPLOOPS)
-                       ? RPMMESS_WARNING : RPMMESS_DEBUG;
+                       ? RPMMESS_WARNING : RPMLOG_DEBUG;
 ;
 
                /* Unchain predecessor loop. */
@@ -1395,7 +1395,7 @@ rescan:
        /* If a relation was eliminated, then continue sorting. */
        /* XXX TODO: add control bit. */
        if (nzaps && nrescans-- > 0) {
-           rpmlog(RPMMESS_DEBUG, _("========== continuing tsort ...\n"));
+           rpmlog(RPMLOG_DEBUG, _("========== continuing tsort ...\n"));
            goto rescan;
        }
 
@@ -1513,7 +1513,7 @@ int rpmtsCheck(rpmts ts)
        rpmds provides;
 
        /* FIX: rpmts{A,O} can return null. */
-       rpmlog(RPMMESS_DEBUG, "========== +++ %s %s/%s 0x%x\n",
+       rpmlog(RPMLOG_DEBUG, "========== +++ %s %s/%s 0x%x\n",
                rpmteNEVR(p), rpmteA(p), rpmteO(p), rpmteColor(p));
        rc = checkPackageDeps(ts, rpmteNEVRA(p),
                        rpmteDS(p, RPMTAG_REQUIRENAME),
@@ -1553,7 +1553,7 @@ int rpmtsCheck(rpmts ts)
        rpmfi fi;
 
        /* FIX: rpmts{A,O} can return null. */
-       rpmlog(RPMMESS_DEBUG, "========== --- %s %s/%s 0x%x\n",
+       rpmlog(RPMLOG_DEBUG, "========== --- %s %s/%s 0x%x\n",
                rpmteNEVR(p), rpmteA(p), rpmteO(p), rpmteColor(p));
 
        rc = 0;

diff --git a/lib/fs.c b/lib/fs.c
index b41ea8d..68fbbf7 100644 (file)
--- a/lib/fs.c
+++ b/lib/fs.c
@@ -211,7 +211,7 @@ static int getFilesystemList(void)
        filesystems[numFilesystems].mntPoint = xstrdup(mntdir);
        filesystems[numFilesystems].rdonly = rdonly;
 #if 0
-       rpmlog(RPMMESS_DEBUG, _("%5d 0x%04x %s %s\n"),
+       rpmlog(RPMLOG_DEBUG, _("%5d 0x%04x %s %s\n"),
                numFilesystems,
                (unsigned) filesystems[numFilesystems].dev,
                (filesystems[numFilesystems].rdonly ? "ro" : "rw"),

diff --git a/lib/fsm.c b/lib/fsm.c
index 1705d22..a50bb62 100644 (file)
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -301,13 +301,13 @@ void * dnlInitIterator(const FSM_t fsm,
                if (!dnli->active[i]) continue;
                if (j == 0) {
                    j = 1;
-                   rpmlog(RPMMESS_DEBUG,
+                   rpmlog(RPMLOG_DEBUG,
        _("========== Directories not explicitly included in package:\n"));
                }
-               rpmlog(RPMMESS_DEBUG, _("%10d %s\n"), i, fi->dnl[i]);
+               rpmlog(RPMLOG_DEBUG, _("%10d %s\n"), i, fi->dnl[i]);
            }
            if (j)
-               rpmlog(RPMMESS_DEBUG, "==========\n");
+               rpmlog(RPMLOG_DEBUG, "==========\n");
        }
     }
     return dnli;
@@ -1171,11 +1171,11 @@ static int fsmMkdirs(FSM_t fsm)
                    }
 
                    if (fsm->fcontext == NULL)
-                       rpmlog(RPMMESS_DEBUG,
+                       rpmlog(RPMLOG_DEBUG,
                            _("%s directory created with perms %04o, no context.\n"),
                            fsm->path, (unsigned)(st->st_mode & 07777));
                    else
-                       rpmlog(RPMMESS_DEBUG,
+                       rpmlog(RPMLOG_DEBUG,
                            _("%s directory created with perms %04o, context %s.\n"),
                            fsm->path, (unsigned)(st->st_mode & 07777),
                            fsm->fcontext);
@@ -1265,7 +1265,7 @@ int fsmStage(FSM_t fsm, fileStage stage)
        /* do nothing */
     } else if (stage & FSM_INTERNAL) {
        if (_fsm_debug && !(stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s %06o%3d (%4d,%4d)%10d %s %s\n",
+           rpmlog(RPMLOG_DEBUG, " %8s %06o%3d (%4d,%4d)%10d %s %s\n",
                cur,
                (unsigned)st->st_mode, (int)st->st_nlink,
                (int)st->st_uid, (int)st->st_gid, (int)st->st_size,
@@ -1274,7 +1274,7 @@ int fsmStage(FSM_t fsm, fileStage stage)
     } else {
        fsm->stage = stage;
        if (_fsm_debug || !(stage & FSM_VERBOSE))
-           rpmlog(RPMMESS_DEBUG, "%-8s  %06o%3d (%4d,%4d)%10d %s %s\n",
+           rpmlog(RPMLOG_DEBUG, "%-8s  %06o%3d (%4d,%4d)%10d %s %s\n",
                cur,
                (unsigned)st->st_mode, (int)st->st_nlink,
                (int)st->st_uid, (int)st->st_gid, (int)st->st_size,
@@ -1923,7 +1923,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
        }
        rc = Unlink(fsm->path);
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s) %s\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s) %s\n", cur,
                fsm->path, (rc < 0 ? strerror(errno) : ""));
        if (rc < 0)
            rc = (errno == ENOENT ? CPIOERR_ENOENT : CPIOERR_UNLINK_FAILED);
@@ -1943,14 +1943,14 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
        }
 #endif
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, %s) %s\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, %s) %s\n", cur,
                fsm->opath, fsm->path, (rc < 0 ? strerror(errno) : ""));
        if (rc < 0)     rc = CPIOERR_RENAME_FAILED;
        break;
     case FSM_MKDIR:
        rc = Mkdir(fsm->path, (st->st_mode & 07777));
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, 0%04o) %s\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, 0%04o) %s\n", cur,
                fsm->path, (unsigned)(st->st_mode & 07777),
                (rc < 0 ? strerror(errno) : ""));
        if (rc < 0)     rc = CPIOERR_MKDIR_FAILED;
@@ -1958,7 +1958,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
     case FSM_RMDIR:
        rc = Rmdir(fsm->path);
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s) %s\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s) %s\n", cur,
                fsm->path, (rc < 0 ? strerror(errno) : ""));
        if (rc < 0)
            switch (errno) {
@@ -1973,7 +1973,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
            break;
        rc = lsetfilecon(fsm->path, (security_context_t)fsm->fcontext);
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, %s) %s\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, %s) %s\n", cur,
                fsm->path, fsm->fcontext,
                (rc < 0 ? strerror(errno) : ""));
        if (rc < 0) rc = (errno == EOPNOTSUPP ? 0 : CPIOERR_LSETFCON_FAILED);
@@ -1981,7 +1981,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
     case FSM_CHOWN:
        rc = chown(fsm->path, st->st_uid, st->st_gid);
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, %d, %d) %s\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, %d, %d) %s\n", cur,
                fsm->path, (int)st->st_uid, (int)st->st_gid,
                (rc < 0 ? strerror(errno) : ""));
        if (rc < 0)     rc = CPIOERR_CHOWN_FAILED;
@@ -1990,7 +1990,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
 #if ! CHOWN_FOLLOWS_SYMLINK
        rc = lchown(fsm->path, st->st_uid, st->st_gid);
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, %d, %d) %s\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, %d, %d) %s\n", cur,
                fsm->path, (int)st->st_uid, (int)st->st_gid,
                (rc < 0 ? strerror(errno) : ""));
        if (rc < 0)     rc = CPIOERR_CHOWN_FAILED;
@@ -1999,7 +1999,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
     case FSM_CHMOD:
        rc = chmod(fsm->path, (st->st_mode & 07777));
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, 0%04o) %s\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, 0%04o) %s\n", cur,
                fsm->path, (unsigned)(st->st_mode & 07777),
                (rc < 0 ? strerror(errno) : ""));
        if (rc < 0)     rc = CPIOERR_CHMOD_FAILED;
@@ -2010,7 +2010,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
            stamp.modtime = st->st_mtime;
            rc = utime(fsm->path, &stamp);
            if (_fsm_debug && (stage & FSM_SYSCALL))
-               rpmlog(RPMMESS_DEBUG, " %8s (%s, 0x%x) %s\n", cur,
+               rpmlog(RPMLOG_DEBUG, " %8s (%s, 0x%x) %s\n", cur,
                        fsm->path, (unsigned)st->st_mtime,
                        (rc < 0 ? strerror(errno) : ""));
            if (rc < 0) rc = CPIOERR_UTIME_FAILED;
@@ -2019,21 +2019,21 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
     case FSM_SYMLINK:
        rc = symlink(fsm->opath, fsm->path);
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, %s) %s\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, %s) %s\n", cur,
                fsm->opath, fsm->path, (rc < 0 ? strerror(errno) : ""));
        if (rc < 0)     rc = CPIOERR_SYMLINK_FAILED;
        break;
     case FSM_LINK:
        rc = Link(fsm->opath, fsm->path);
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, %s) %s\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, %s) %s\n", cur,
                fsm->opath, fsm->path, (rc < 0 ? strerror(errno) : ""));
        if (rc < 0)     rc = CPIOERR_LINK_FAILED;
        break;
     case FSM_MKFIFO:
        rc = mkfifo(fsm->path, (st->st_mode & 07777));
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, 0%04o) %s\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, 0%04o) %s\n", cur,
                fsm->path, (unsigned)(st->st_mode & 07777),
                (rc < 0 ? strerror(errno) : ""));
        if (rc < 0)     rc = CPIOERR_MKFIFO_FAILED;
@@ -2042,7 +2042,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
        /* FIX: check S_IFIFO or dev != 0 */
        rc = mknod(fsm->path, (st->st_mode & ~07777), st->st_rdev);
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, 0%o, 0x%x) %s\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, 0%o, 0x%x) %s\n", cur,
                fsm->path, (unsigned)(st->st_mode & ~07777),
                (unsigned)st->st_rdev,
                (rc < 0 ? strerror(errno) : ""));
@@ -2051,7 +2051,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
     case FSM_LSTAT:
        rc = Lstat(fsm->path, ost);
        if (_fsm_debug && (stage & FSM_SYSCALL) && rc && errno != ENOENT)
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, ost) %s\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, ost) %s\n", cur,
                fsm->path, (rc < 0 ? strerror(errno) : ""));
        if (rc < 0) {
            rc = (errno == ENOENT ? CPIOERR_ENOENT : CPIOERR_LSTAT_FAILED);
@@ -2061,7 +2061,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
     case FSM_STAT:
        rc = Stat(fsm->path, ost);
        if (_fsm_debug && (stage & FSM_SYSCALL) && rc && errno != ENOENT)
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, ost) %s\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, ost) %s\n", cur,
                fsm->path, (rc < 0 ? strerror(errno) : ""));
        if (rc < 0) {
            rc = (errno == ENOENT ? CPIOERR_ENOENT : CPIOERR_STAT_FAILED);
@@ -2072,7 +2072,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
        /* XXX NUL terminated result in fsm->rdbuf, len in fsm->rdnb. */
        rc = Readlink(fsm->path, fsm->rdbuf, fsm->rdsize - 1);
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, rdbuf, %d) %s\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, rdbuf, %d) %s\n", cur,
                fsm->path, (int)(fsm->rdsize -1), (rc < 0 ? strerror(errno) : ""));
        if (rc < 0)     rc = CPIOERR_READLINK_FAILED;
        else {
@@ -2132,7 +2132,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
     case FSM_DREAD:
        fsm->rdnb = Fread(fsm->wrbuf, sizeof(*fsm->wrbuf), fsm->wrlen, fsm->cfd);
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, %d, cfd)\trdnb %d\n",
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, %d, cfd)\trdnb %d\n",
                cur, (fsm->wrbuf == fsm->wrb ? "wrbuf" : "mmap"),
                (int)fsm->wrlen, (int)fsm->rdnb);
        if (fsm->rdnb != fsm->wrlen || Ferror(fsm->cfd))
@@ -2143,7 +2143,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
     case FSM_DWRITE:
        fsm->wrnb = Fwrite(fsm->rdbuf, sizeof(*fsm->rdbuf), fsm->rdnb, fsm->cfd);
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, %d, cfd)\twrnb %d\n",
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, %d, cfd)\twrnb %d\n",
                cur, (fsm->rdbuf == fsm->rdb ? "rdbuf" : "mmap"),
                (int)fsm->rdnb, (int)fsm->wrnb);
        if (fsm->rdnb != fsm->wrnb || Ferror(fsm->cfd))
@@ -2161,13 +2161,13 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
            break;
        }
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, \"r\") rfd %p rdbuf %p\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, \"r\") rfd %p rdbuf %p\n", cur,
                fsm->path, fsm->rfd, fsm->rdbuf);
        break;
     case FSM_READ:
        fsm->rdnb = Fread(fsm->rdbuf, sizeof(*fsm->rdbuf), fsm->rdlen, fsm->rfd);
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (rdbuf, %d, rfd)\trdnb %d\n",
+           rpmlog(RPMLOG_DEBUG, " %8s (rdbuf, %d, rfd)\trdnb %d\n",
                cur, (int)fsm->rdlen, (int)fsm->rdnb);
        if (fsm->rdnb != fsm->rdlen || Ferror(fsm->rfd))
            rc = CPIOERR_READ_FAILED;
@@ -2175,7 +2175,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
     case FSM_RCLOSE:
        if (fsm->rfd != NULL) {
            if (_fsm_debug && (stage & FSM_SYSCALL))
-               rpmlog(RPMMESS_DEBUG, " %8s (%p)\n", cur, fsm->rfd);
+               rpmlog(RPMLOG_DEBUG, " %8s (%p)\n", cur, fsm->rfd);
            (void) rpmswAdd(rpmtsOp(fsmGetTs(fsm), RPMTS_OP_DIGEST),
                        fdstat_op(fsm->rfd, FDSTAT_DIGEST));
            (void) Fclose(fsm->rfd);
@@ -2191,13 +2191,13 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
            rc = CPIOERR_OPEN_FAILED;
        }
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (%s, \"w\") wfd %p wrbuf %p\n", cur,
+           rpmlog(RPMLOG_DEBUG, " %8s (%s, \"w\") wfd %p wrbuf %p\n", cur,
                fsm->path, fsm->wfd, fsm->wrbuf);
        break;
     case FSM_WRITE:
        fsm->wrnb = Fwrite(fsm->wrbuf, sizeof(*fsm->wrbuf), fsm->rdnb, fsm->wfd);
        if (_fsm_debug && (stage & FSM_SYSCALL))
-           rpmlog(RPMMESS_DEBUG, " %8s (wrbuf, %d, wfd)\twrnb %d\n",
+           rpmlog(RPMLOG_DEBUG, " %8s (wrbuf, %d, wfd)\twrnb %d\n",
                cur, (int)fsm->rdnb, (int)fsm->wrnb);
        if (fsm->rdnb != fsm->wrnb || Ferror(fsm->wfd))
            rc = CPIOERR_WRITE_FAILED;
@@ -2205,7 +2205,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
     case FSM_WCLOSE:
        if (fsm->wfd != NULL) {
            if (_fsm_debug && (stage & FSM_SYSCALL))
-               rpmlog(RPMMESS_DEBUG, " %8s (%p)\n", cur, fsm->wfd);
+               rpmlog(RPMLOG_DEBUG, " %8s (%p)\n", cur, fsm->wfd);
            (void) rpmswAdd(rpmtsOp(fsmGetTs(fsm), RPMTS_OP_DIGEST),
                        fdstat_op(fsm->wfd, FDSTAT_DIGEST));
            (void) Fclose(fsm->wfd);

diff --git a/lib/manifest.c b/lib/manifest.c
index 1c05667..d0b0744 100644 (file)
--- a/lib/manifest.c
+++ b/lib/manifest.c
@@ -119,7 +119,7 @@ rpmRC rpmReadPackageManifest(FD_t fd, int * argcPtr, const char *** argvPtr)
     rpmrc = rpmGlob(s, &ac, &av);
     if (rpmrc != RPMRC_OK) goto exit;
 
-    rpmlog(RPMMESS_DEBUG, _("adding %d args from manifest.\n"), ac);
+    rpmlog(RPMLOG_DEBUG, _("adding %d args from manifest.\n"), ac);
 
     /* Count non-NULL args, keeping track of 1st arg after last NULL. */
     npre = 0;

diff --git a/lib/package.c b/lib/package.c
index ab0d9f5..6afa18f 100644 (file)
--- a/lib/package.c
+++ b/lib/package.c
@@ -949,12 +949,12 @@ rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
     rc = rpmVerifySignature(ts, buf);
     switch (rc) {
     case RPMRC_OK:             /* Signature is OK. */
-       rpmlog(RPMMESS_DEBUG, "%s: %s", fn, buf);
+       rpmlog(RPMLOG_DEBUG, "%s: %s", fn, buf);
        break;
     case RPMRC_NOTTRUSTED:     /* Signature is OK, but key is not trusted. */
     case RPMRC_NOKEY:          /* Public key is unavailable. */
        /* XXX Print NOKEY/NOTTRUSTED warning only once. */
-    {  int lvl = (rpmtsStashKeyid(ts) ? RPMMESS_DEBUG : RPMMESS_WARNING);
+    {  int lvl = (rpmtsStashKeyid(ts) ? RPMLOG_DEBUG : RPMMESS_WARNING);
        rpmlog(lvl, "%s: %s", fn, buf);
     }  break;
     case RPMRC_NOTFOUND:       /* Signature is unknown type. */

diff --git a/lib/psm.c b/lib/psm.c
index e1e10bb..ac884b3 100644 (file)
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -441,7 +441,7 @@ static pid_t psmWait(rpmpsm psm)
     msecs = psm->sq.op.usecs/1000;
     (void) rpmswAdd(rpmtsOp(ts, RPMTS_OP_SCRIPTLETS), &psm->sq.op);
 
-    rpmlog(RPMMESS_DEBUG,
+    rpmlog(RPMLOG_DEBUG,
        _("%s: waitpid(%d) rc %d status %x secs %u.%03u\n"),
        psm->stepName, (unsigned)psm->sq.child,
        (unsigned)psm->sq.reaped, psm->sq.status,
@@ -582,7 +582,7 @@ static rpmRC runScript(rpmpsm psm, Header h, const char * sln,
 
     if (progArgv && strcmp(progArgv[0], "<lua>") == 0) {
 #ifdef WITH_LUA
-       rpmlog(RPMMESS_DEBUG,
+       rpmlog(RPMLOG_DEBUG,
                _("%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"),
                psm->stepName, tag2sln(psm->scriptTag), n, v, r, a);
        return runLuaScript(psm, h, sln, progArgc, progArgv,
@@ -599,7 +599,7 @@ static rpmRC runScript(rpmpsm psm, Header h, const char * sln,
      */
     if (ldconfig_path && progArgv != NULL && psm->unorderedSuccessor) {
        if (ldconfig_done && !strcmp(progArgv[0], ldconfig_path)) {
-           rpmlog(RPMMESS_DEBUG,
+           rpmlog(RPMLOG_DEBUG,
                _("%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"),
                psm->stepName, tag2sln(psm->scriptTag), n, v, r, a,
                progArgv[0]);
@@ -607,7 +607,7 @@ static rpmRC runScript(rpmpsm psm, Header h, const char * sln,
        }
     }
 
-    rpmlog(RPMMESS_DEBUG,
+    rpmlog(RPMLOG_DEBUG,
                _("%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"),
                psm->stepName, tag2sln(psm->scriptTag), n, v, r, a,
                (psm->unorderedSuccessor ? "a" : ""));
@@ -807,7 +807,7 @@ static rpmRC runScript(rpmpsm psm, Header h, const char * sln,
                xx = chroot(rootDir);
            }
            xx = chdir("/");
-           rpmlog(RPMMESS_DEBUG, _("%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"),
+           rpmlog(RPMLOG_DEBUG, _("%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"),
                        psm->stepName, sln, n, v, r, a,
                        argv[0], (unsigned)getpid());
 
@@ -1253,7 +1253,7 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage)
     case PSM_UNKNOWN:
        break;
     case PSM_INIT:
-       rpmlog(RPMMESS_DEBUG, _("%s: %s has %d files, test = %d\n"),
+       rpmlog(RPMLOG_DEBUG, _("%s: %s has %d files, test = %d\n"),
                psm->stepName, rpmteNEVR(psm->te),
                rpmfiFC(fi), (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST));
 
@@ -1978,7 +1978,7 @@ assert(psm->mi == NULL);
                /* OK, we got a real score so lets get the appropriate
                 * score entry.
                 */
-               rpmlog(RPMMESS_DEBUG,
+               rpmlog(RPMLOG_DEBUG,
                    _("Attempting to mark %s as installed in score board(%p).\n"),
                    rpmteN(psm->te), score);
                se = rpmtsScoreGetEntry(score, rpmteN(psm->te));
@@ -2011,7 +2011,7 @@ assert(psm->mi == NULL);
                /* OK, we got a real score so lets get the appropriate
                 * score entry.
                 */
-               rpmlog(RPMMESS_DEBUG,
+               rpmlog(RPMLOG_DEBUG,
                    _("Attempting to mark %s as erased in score board(%p).\n"),
                    rpmteN(psm->te), score);
                se = rpmtsScoreGetEntry(score, rpmteN(psm->te));

diff --git a/lib/query.c b/lib/query.c
index eec8e0a..d2fc8a8 100644 (file)
--- a/lib/query.c
+++ b/lib/query.c
@@ -647,7 +647,7 @@ int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg)
            rpmlog(RPMERR_QUERYINFO, _("invalid package number: %s\n"), arg);
            return 1;
        }
-       rpmlog(RPMMESS_DEBUG, _("package record number: %u\n"), recOffset);
+       rpmlog(RPMLOG_DEBUG, _("package record number: %u\n"), recOffset);
        /* RPMDBI_PACKAGES */
        qva->qva_mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, &recOffset, sizeof(recOffset));
        if (qva->qva_mi == NULL) {

diff --git a/lib/rpmds.c b/lib/rpmds.c
index 7702849..fc8cfe5 100644 (file)
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -504,7 +504,7 @@ void rpmdsNotify(rpmds ds, const char * where, int rc)
     if (!(ds->Type != NULL && ds->DNEVR != NULL))
        return;
 
-    rpmlog(RPMMESS_DEBUG, "%9s: %-45s %-s %s\n", ds->Type,
+    rpmlog(RPMLOG_DEBUG, "%9s: %-45s %-s %s\n", ds->Type,
                (!strcmp(ds->DNEVR, "cached") ? ds->DNEVR : ds->DNEVR+2),
                (rc ? _("NO ") : _("YES")),
                (where != NULL ? where : ""));
@@ -799,7 +799,7 @@ int rpmdsCompare(const rpmds A, const rpmds B)
        sense = rpmvercmp(aE, bE);
     else if (aE && *aE && atol(aE) > 0) {
        if (!B->nopromote) {
-           int lvl = (_rpmds_unspecified_epoch_noise  ? RPMMESS_WARNING : RPMMESS_DEBUG);
+           int lvl = (_rpmds_unspecified_epoch_noise  ? RPMMESS_WARNING : RPMLOG_DEBUG);
            rpmlog(lvl, _("The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n\tA = \"%s\"\tB = \"%s\"\n"),
                aDepend, bDepend);
            sense = 0;
@@ -831,7 +831,7 @@ int rpmdsCompare(const rpmds A, const rpmds B)
 
 exit:
     if (_noisy_range_comparison_debug_message)
-    rpmlog(RPMMESS_DEBUG, _("  %s    A %s\tB %s\n"),
+    rpmlog(RPMLOG_DEBUG, _("  %s    A %s\tB %s\n"),
        (result ? _("YES") : _("NO ")), aDepend, bDepend);
     aDepend = _free(aDepend);
     bDepend = _free(bDepend);
@@ -853,7 +853,7 @@ void rpmdsProblem(rpmps ps, const char * pkgNEVR, const rpmds ds,
     if (EVR == NULL) EVR = "?EVR?";
     if (DNEVR == NULL) DNEVR = "? ?N? ?OP? ?EVR?";
 
-    rpmlog(RPMMESS_DEBUG, _("package %s has unsatisfied %s: %s\n"),
+    rpmlog(RPMLOG_DEBUG, _("package %s has unsatisfied %s: %s\n"),
            pkgNEVR, ds->Type, DNEVR+2);
 
     switch ((unsigned)DNEVR[0]) {

diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 2125767..18a97c6 100644 (file)
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -488,7 +488,7 @@ rpmFileAction rpmfiDecideFate(const rpmfi ofi, rpmfi nfi, int skipMissing)
         * package has marked it as missingok, or allfiles is requested.
         */
        if (skipMissing && (newFlags & RPMFILE_MISSINGOK)) {
-           rpmlog(RPMMESS_DEBUG, _("%s skipped due to missingok flag\n"),
+           rpmlog(RPMLOG_DEBUG, _("%s skipped due to missingok flag\n"),
                        fn);
            return FA_SKIP;
        } else {
@@ -757,14 +757,14 @@ assert(p != NULL);
 
     if (!_printed) {
        _printed = 1;
-       rpmlog(RPMMESS_DEBUG, _("========== relocations\n"));
+       rpmlog(RPMLOG_DEBUG, _("========== relocations\n"));
        for (i = 0; i < numRelocations; i++) {
            if (relocations[i].oldPath == NULL) continue; /* XXX can't happen */
            if (relocations[i].newPath == NULL)
-               rpmlog(RPMMESS_DEBUG, _("%5d exclude  %s\n"),
+               rpmlog(RPMLOG_DEBUG, _("%5d exclude  %s\n"),
                        i, relocations[i].oldPath);
            else
-               rpmlog(RPMMESS_DEBUG, _("%5d relocate %s -> %s\n"),
+               rpmlog(RPMLOG_DEBUG, _("%5d relocate %s -> %s\n"),
                        i, relocations[i].oldPath, relocations[i].newPath);
        }
     }
@@ -895,7 +895,7 @@ dColors[j] |= fColors[i];
            }
            if (actions) {
                actions[i] = FA_SKIPNSTATE;
-               rpmlog(RPMMESS_DEBUG, _("excluding %s %s\n"),
+               rpmlog(RPMLOG_DEBUG, _("excluding %s %s\n"),
                        ftstring(ft), fn);
            }
            continue;
@@ -905,7 +905,7 @@ dColors[j] |= fColors[i];
        if (fnlen != len) continue;
 
        if (actions)
-           rpmlog(RPMMESS_DEBUG, _("relocating %s to %s\n"),
+           rpmlog(RPMLOG_DEBUG, _("relocating %s to %s\n"),
                    fn, relocations[j].newPath);
        nrelocated++;
 
@@ -995,7 +995,7 @@ dColors[j] |= fColors[i];
                t[slen+1] = '\0';
 
                if (actions)
-                   rpmlog(RPMMESS_DEBUG,
+                   rpmlog(RPMLOG_DEBUG,
                        _("relocating directory %s to %s\n"), dirNames[i], t);
                dirNames[i] = t;
                nrelocated++;

diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index 58045d0..15884e0 100644 (file)
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -184,7 +184,7 @@ static rpmRC rpmgiWalkPathFilter(rpmgi gi)
     const char * s;
 
 if (_rpmgi_debug < 0)
-rpmlog(RPMMESS_DEBUG, "FTS_%s\t%*s %s%s\n", ftsInfoStr(fts->fts_info),
+rpmlog(RPMLOG_DEBUG, "FTS_%s\t%*s %s%s\n", ftsInfoStr(fts->fts_info),
                indent * (fts->fts_level < 0 ? 0 : fts->fts_level), "",
                fts->fts_name,
        ((fts->fts_info == FTS_D || fts->fts_info == FTS_DP) ? "/" : ""));

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 1b3eb17..180e081 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -348,7 +348,7 @@ if (fileURL[0] == '=') {
            ts->suggests[ts->nsuggests] = _free(ts->suggests[ts->nsuggests]);
        }
        ts->suggests = _free(ts->suggests);
-       rpmlog(RPMMESS_DEBUG, _("Adding goal: %s\n"), fileURL);
+       rpmlog(RPMLOG_DEBUG, _("Adding goal: %s\n"), fileURL);
        eiu->pkgURL[eiu->pkgx] = fileURL;
        fileURL = NULL;
        eiu->pkgx++;
@@ -377,7 +377,7 @@ if (fileURL[0] == '=') {
 
            /* XXX undefined %{name}/%{version}/%{release} here */
            /* XXX %{_tmpdir} does not exist */
-           rpmlog(RPMMESS_DEBUG, _(" ... as %s\n"), tfn);
+           rpmlog(RPMLOG_DEBUG, _(" ... as %s\n"), tfn);
            rc = urlGetFile(fileURL, tfn);
            if (rc < 0) {
                rpmlog(RPMMESS_ERROR,
@@ -413,7 +413,7 @@ if (fileURL[0] == '=') {
     {
        const char * fileName;
 
-       rpmlog(RPMMESS_DEBUG, "============== %s\n", *eiu->fnp);
+       rpmlog(RPMLOG_DEBUG, "============== %s\n", *eiu->fnp);
        (void) urlPath(*eiu->fnp, &fileName);
 
        /* Try to read the header from a package file. */
@@ -455,7 +455,7 @@ if (fileURL[0] == '=') {
        eiu->isSource = headerIsEntry(eiu->h, RPMTAG_SOURCEPACKAGE);
 
        if (eiu->isSource) {
-           rpmlog(RPMMESS_DEBUG, _("\tadded source package [%d]\n"),
+           rpmlog(RPMLOG_DEBUG, _("\tadded source package [%d]\n"),
                eiu->numSRPMS);
            eiu->sourceURL = xrealloc(eiu->sourceURL,
                                (eiu->numSRPMS + 2) * sizeof(*eiu->sourceURL));
@@ -522,7 +522,7 @@ if (fileURL[0] == '=') {
 
        switch(rc) {
        case 0:
-           rpmlog(RPMMESS_DEBUG, _("\tadded binary package [%d]\n"),
+           rpmlog(RPMLOG_DEBUG, _("\tadded binary package [%d]\n"),
                        eiu->numRPMS);
            break;
        case 1:
@@ -580,7 +580,7 @@ maybe_manifest:
        break;
     }
 
-    rpmlog(RPMMESS_DEBUG, _("found %d source and %d binary packages\n"),
+    rpmlog(RPMLOG_DEBUG, _("found %d source and %d binary packages\n"),
                eiu->numSRPMS, eiu->numRPMS);
 
     if (eiu->numFailed) goto exit;
@@ -629,7 +629,7 @@ maybe_manifest:
 
        rpmcliPackagesTotal += eiu->numSRPMS;
 
-       rpmlog(RPMMESS_DEBUG, _("installing binary packages\n"));
+       rpmlog(RPMLOG_DEBUG, _("installing binary packages\n"));
 
        /* Drop added/available package indices and dependency sets. */
        rpmtsClean(ts);
@@ -947,7 +947,7 @@ int rpmRollback(rpmts ts, struct rpmInstallArguments_s * ia, const char ** argv)
        /* Install the previously erased packages for this transaction. */
        while (rp != NULL && rp->val.u32 == thistid) {
 
-           rpmlog(RPMMESS_DEBUG, "\t+++ install %s\n",
+           rpmlog(RPMLOG_DEBUG, "\t+++ install %s\n",
                        (rp->key ? rp->key : "???"));
 
            rc = rpmtsAddInstallElement(ts, rp->h, (fnpyKey)rp->key,
@@ -973,7 +973,7 @@ int rpmRollback(rpmts ts, struct rpmInstallArguments_s * ia, const char ** argv)
        /* Erase the previously installed packages for this transaction. */
        while (ip != NULL && ip->val.u32 == thistid) {
 
-           rpmlog(RPMMESS_DEBUG,
+           rpmlog(RPMLOG_DEBUG,
                        "\t--- erase h#%u\n", ip->instance);
 
            rc = rpmtsAddEraseElement(ts, ip->h, ip->instance);

diff --git a/lib/rpmts.c b/lib/rpmts.c
index 660f9f9..33cfb92 100644 (file)
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -419,7 +419,7 @@ fprintf(stderr, "*** free pkt %p[%d] id %08x %08x\n", ts->pkpkt, ts->pkpktlen, p
        memcpy(ts->pksignid, pubp->signid, sizeof(ts->pksignid));
 
        if (pubkeysource)
-           rpmlog(RPMMESS_DEBUG, "========== %s pubkey id %08x %08x (%s)\n",
+           rpmlog(RPMLOG_DEBUG, "========== %s pubkey id %08x %08x (%s)\n",
                (sigp->pubkey_algo == PGPPUBKEYALGO_DSA ? "DSA" :
                (sigp->pubkey_algo == PGPPUBKEYALGO_RSA ? "RSA" : "???")),
                pgpGrab(sigp->signid, 4), pgpGrab(sigp->signid+4, 4),
@@ -614,7 +614,7 @@ int rpmtsSolve(rpmts ts, rpmds ds, const void * data)
            if (h != NULL &&
                !rpmtsAddInstallElement(ts, h, (fnpyKey)str, 1, NULL))
            {
-               rpmlog(RPMMESS_DEBUG, _("Adding: %s\n"), str);
+               rpmlog(RPMLOG_DEBUG, _("Adding: %s\n"), str);
                rc = -1;
                /* XXX str memory leak */
                break;
@@ -626,7 +626,7 @@ int rpmtsSolve(rpmts ts, rpmds ds, const void * data)
        goto exit;
     }
 
-    rpmlog(RPMMESS_DEBUG, _("Suggesting: %s\n"), str);
+    rpmlog(RPMLOG_DEBUG, _("Suggesting: %s\n"), str);
     /* If suggestion is already present, don't bother. */
     if (ts->suggests != NULL && ts->nsuggests > 0) {
        if (bsearch(&str, ts->suggests, ts->nsuggests,
@@ -1109,8 +1109,8 @@ int rpmtsInitDSI(const rpmts ts)
     if (rpmtsFilterFlags(ts) & RPMPROB_FILTER_DISKSPACE)
        return 0;
 
-    rpmlog(RPMMESS_DEBUG, _("mounted filesystems:\n"));
-    rpmlog(RPMMESS_DEBUG,
+    rpmlog(RPMLOG_DEBUG, _("mounted filesystems:\n"));
+    rpmlog(RPMLOG_DEBUG,
        _("    i        dev    bsize       bavail       iavail mount point\n"));
 
     rc = rpmGetFilesystemList(&ts->filesystems, &ts->filesystemCount);
@@ -1167,7 +1167,7 @@ int rpmtsInitDSI(const rpmts ts)
        /* XXX Avoid FAT and other file systems that have not inodes. */
        dsi->iavail = !(sfb.f_ffree == 0 && sfb.f_files == 0)
                                ? sfb.f_ffree : -1;
-       rpmlog(RPMMESS_DEBUG, _("%5d 0x%08x %8u %12ld %12ld %s\n"),
+       rpmlog(RPMLOG_DEBUG, _("%5d 0x%08x %8u %12ld %12ld %s\n"),
                i, (unsigned) dsi->dev, (unsigned) dsi->bsize,
                (signed long) dsi->bavail, (signed long) dsi->iavail,
                ts->filesystems[i]);
@@ -1494,12 +1494,12 @@ rpmRC rpmtsScoreInit(rpmts runningTS, rpmts rollbackTS)
     rpmRC      rc = RPMRC_OK; /* Assume success */
     rpmtsScoreEntry se;
 
-    rpmlog(RPMMESS_DEBUG, _("Creating transaction score board(%p, %p)\n"),
+    rpmlog(RPMLOG_DEBUG, _("Creating transaction score board(%p, %p)\n"),
        runningTS, rollbackTS); 
 
     /* Allocate space for score board */
     score = xcalloc(1, sizeof(*score));
-    rpmlog(RPMMESS_DEBUG, _("\tScore board address:  %p\n"), score);
+    rpmlog(RPMLOG_DEBUG, _("\tScore board address:  %p\n"), score);
 
     /* 
      * Determine the maximum size needed for the entry list.
@@ -1509,7 +1509,7 @@ rpmRC rpmtsScoreInit(rpmts runningTS, rpmts rollbackTS)
      *      but for now it will work.
      */
     tranElements  = rpmtsNElements(runningTS);
-    rpmlog(RPMMESS_DEBUG, _("\tAllocating space for %d entries\n"), tranElements);
+    rpmlog(RPMLOG_DEBUG, _("\tAllocating space for %d entries\n"), tranElements);
     score->scores = xcalloc(tranElements, sizeof(score->scores));
 
     /* Initialize score entry count */
@@ -1536,10 +1536,10 @@ rpmRC rpmtsScoreInit(rpmts runningTS, rpmts rollbackTS)
        /* If we did not find the entry then allocate space for it */
        if (!found) {
 /* XXX p->fi->te undefined. */
-           rpmlog(RPMMESS_DEBUG, _("\tAdding entry for %s to score board.\n"),
+           rpmlog(RPMLOG_DEBUG, _("\tAdding entry for %s to score board.\n"),
                rpmteN(p));
            se = xcalloc(1, sizeof(*(*(score->scores))));
-           rpmlog(RPMMESS_DEBUG, _("\t\tEntry address:  %p\n"), se);
+           rpmlog(RPMLOG_DEBUG, _("\t\tEntry address:  %p\n"), se);
            se->N         = xstrdup(rpmteN(p));
            se->te_types  = rpmteType(p); 
            se->installed = 0;
@@ -1550,7 +1550,7 @@ rpmRC rpmtsScoreInit(rpmts runningTS, rpmts rollbackTS)
            /* We found this one, so just add the element type to the one 
             * already there.
             */
-           rpmlog(RPMMESS_DEBUG, _("\tUpdating entry for %s in score board.\n"),
+           rpmlog(RPMLOG_DEBUG, _("\tUpdating entry for %s in score board.\n"),
                rpmteN(p));
            score->scores[i]->te_types |= rpmteType(p);
        }
@@ -1575,7 +1575,7 @@ rpmtsScore rpmtsScoreFree(rpmtsScore score)
     rpmtsScoreEntry se = NULL;
     int i;
 
-    rpmlog(RPMMESS_DEBUG, _("May free Score board(%p)\n"), score);
+    rpmlog(RPMLOG_DEBUG, _("May free Score board(%p)\n"), score);
 
     /* If score is not initialized, then just return.
      * This is likely the case if autorollbacks are not enabled.
@@ -1590,7 +1590,7 @@ rpmtsScore rpmtsScoreFree(rpmtsScore score)
      */
     if (score->nrefs > 0) return NULL;
 
-    rpmlog(RPMMESS_DEBUG, _("\tRefcount is zero...will free\n"));
+    rpmlog(RPMLOG_DEBUG, _("\tRefcount is zero...will free\n"));
     /* No more references, lets clean up  */
     /* First deallocate the score entries */
     for(i = 0; i < score->entries; i++) {
@@ -1638,13 +1638,13 @@ rpmtsScoreEntry rpmtsScoreGetEntry(rpmtsScore score, const char *N)
     rpmtsScoreEntry se;
     rpmtsScoreEntry ret = NULL; /* Assume we don't find it */
 
-    rpmlog(RPMMESS_DEBUG, _("Looking in score board(%p) for %s\n"), score, N);
+    rpmlog(RPMLOG_DEBUG, _("Looking in score board(%p) for %s\n"), score, N);
 
     /* Try to find the entry in the score list */
     for(i = 0; i < score->entries; i++) {
        se = score->scores[i]; 
        if (strcmp(N, se->N) == 0) {
-           rpmlog(RPMMESS_DEBUG, _("\tFound entry at address:  %p\n"), se);
+           rpmlog(RPMLOG_DEBUG, _("\tFound entry at address:  %p\n"), se);
            ret = se;
            break;
        }

diff --git a/lib/signature.c b/lib/signature.c
index 9c7fb95..29d4f17 100644 (file)
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -113,11 +113,11 @@ static inline rpmRC printSize(FD_t fd, int siglen, int pad, int datalen)
     } else if (fstat(fdno, &st) < 0)
        return RPMRC_FAIL;
 
-    rpmlog(RPMMESS_DEBUG,
+    rpmlog(RPMLOG_DEBUG,
        _("Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"),
                (int)sizeof(struct rpmlead)+siglen+pad+datalen,
                (int)sizeof(struct rpmlead), siglen, pad, datalen);
-    rpmlog(RPMMESS_DEBUG,
+    rpmlog(RPMLOG_DEBUG,
        _("  Actual size: %12d\n"), (int)st.st_size);
 
     return RPMRC_OK;
@@ -319,7 +319,7 @@ int rpmWriteSignature(FD_t fd, Header sigh)
        if (Fwrite(buf, sizeof(buf[0]), pad, fd) != pad)
            rc = 1;
     }
-    rpmlog(RPMMESS_DEBUG, _("Signature: size(%d)+pad(%d)\n"), sigSize, pad);
+    rpmlog(RPMLOG_DEBUG, _("Signature: size(%d)+pad(%d)\n"), sigSize, pad);
     return rc;
 }
 
@@ -431,7 +431,7 @@ static int makePGPSignature(const char * file, int_32 * sigTagp,
     }
 
     *pktlenp = st.st_size;
-    rpmlog(RPMMESS_DEBUG, _("PGP sig size: %d\n"), *pktlenp);
+    rpmlog(RPMLOG_DEBUG, _("PGP sig size: %d\n"), *pktlenp);
     *pktp = xmalloc(*pktlenp);
 
     {  FD_t fd;
@@ -450,7 +450,7 @@ static int makePGPSignature(const char * file, int_32 * sigTagp,
        }
     }
 
-    rpmlog(RPMMESS_DEBUG, _("Got %d bytes of PGP sig\n"), *pktlenp);
+    rpmlog(RPMLOG_DEBUG, _("Got %d bytes of PGP sig\n"), *pktlenp);
 
 #ifdef NOTYET
     /* Parse the signature, change signature tag as appropriate. */
@@ -543,7 +543,7 @@ static int makeGPGSignature(const char * file, int_32 * sigTagp,
     }
 
     *pktlenp = st.st_size;
-    rpmlog(RPMMESS_DEBUG, _("GPG sig size: %d\n"), *pktlenp);
+    rpmlog(RPMLOG_DEBUG, _("GPG sig size: %d\n"), *pktlenp);
     *pktp = xmalloc(*pktlenp);
 
     {  FD_t fd;
@@ -562,7 +562,7 @@ static int makeGPGSignature(const char * file, int_32 * sigTagp,
        }
     }
 
-    rpmlog(RPMMESS_DEBUG, _("Got %d bytes of GPG sig\n"), *pktlenp);
+    rpmlog(RPMLOG_DEBUG, _("Got %d bytes of GPG sig\n"), *pktlenp);
 
     /* Parse the signature, change signature tag as appropriate. */
     dig = pgpNewDig();

diff --git a/lib/transaction.c b/lib/transaction.c
index 36182d5..1c38658 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -861,7 +861,7 @@ static void skipFiles(const rpmts ts, rpmfi fi)
                continue;
            if (strncmp(fbn, bn, bnlen))
                continue;
-           rpmlog(RPMMESS_DEBUG, _("excluding directory %s\n"), dn);
+           rpmlog(RPMLOG_DEBUG, _("excluding directory %s\n"), dn);
            fi->actions[i] = FA_SKIPNSTATE;
            break;
        }
@@ -1041,7 +1041,7 @@ static rpmRC getRepackageHeaderFromTE(rpmts ts, rpmte te,
     int rc   = RPMRC_NOTFOUND; /* Assume we do not find it*/
     int xx;
 
-    rpmlog(RPMMESS_DEBUG,
+    rpmlog(RPMLOG_DEBUG,
        _("Getting repackaged header from transaction element\n"));
 
     /* Set header pointer to null if its not already */
@@ -1067,15 +1067,15 @@ static rpmRC getRepackageHeaderFromTE(rpmts ts, rpmte te,
     xx = snprintf(rp, nb, "%s/%s%s.rpm", _repackage_dir, name, globStr);
 
     /* Get the index of possible repackaged packages */
-    rpmlog(RPMMESS_DEBUG, _("\tLooking for %s...\n"), rp);
+    rpmlog(RPMLOG_DEBUG, _("\tLooking for %s...\n"), rp);
     rtids = IDTXglob(ts, rp, RPMTAG_REMOVETID);
     rp = _free(rp);
     if (rtids != NULL) {
-       rpmlog(RPMMESS_DEBUG, _("\tMatches found.\n"));
+       rpmlog(RPMLOG_DEBUG, _("\tMatches found.\n"));
        rpIDT = rtids->idt;
        nrids = rtids->nidt;
     } else {
-       rpmlog(RPMMESS_DEBUG, _("\tNo matches found.\n"));
+       rpmlog(RPMLOG_DEBUG, _("\tNo matches found.\n"));
        goto exit;
     }
 
@@ -1087,7 +1087,7 @@ static rpmRC getRepackageHeaderFromTE(rpmts ts, rpmte te,
         * get out of here...the repackaged package was not found.
         */
        if (rpIDT == NULL) {
-           rpmlog(RPMMESS_DEBUG, _("\tRepackaged package not found!.\n"));
+           rpmlog(RPMLOG_DEBUG, _("\tRepackaged package not found!.\n"));
            break;
        }
 
@@ -1108,9 +1108,9 @@ static rpmRC getRepackageHeaderFromTE(rpmts ts, rpmte te,
         * would be found.
         * XXX:  Should Match NAC!
         */
-       rpmlog(RPMMESS_DEBUG, _("\tREMOVETID matched INSTALLTID.\n"));
+       rpmlog(RPMLOG_DEBUG, _("\tREMOVETID matched INSTALLTID.\n"));
        if (headerGetEntry(rpIDT->h, RPMTAG_NAME, NULL, (void **) &rpname, NULL)) {
-           rpmlog(RPMMESS_DEBUG, _("\t\tName:  %s.\n"), rpname);
+           rpmlog(RPMLOG_DEBUG, _("\t\tName:  %s.\n"), rpname);
            if (!strcmp(name,rpname)) {
                /* It matched we have a canidate */
                h  = headerLink(rpIDT->h);
@@ -1132,7 +1132,7 @@ static rpmRC getRepackageHeaderFromTE(rpmts ts, rpmte te,
 
 exit:
     if (rc != RPMRC_NOTFOUND && h != NULL && hdrp != NULL) {
-       rpmlog(RPMMESS_DEBUG, _("\tRepackaged Package was %s...\n"), rp);
+       rpmlog(RPMLOG_DEBUG, _("\tRepackaged Package was %s...\n"), rp);
        if (hdrp != NULL)
            *hdrp = headerLink(h);
        if (fnp != NULL)
@@ -1170,7 +1170,7 @@ static rpmRC _rpmtsAddRollbackElement(rpmts rollbackTransaction,
     case TR_ADDED:
     {   rpmdbMatchIterator mi;
 
-       rpmlog(RPMMESS_DEBUG,
+       rpmlog(RPMLOG_DEBUG,
            _("Adding install element to auto-rollback transaction.\n"));
 
        /* Get the header for this package from the database
@@ -1202,9 +1202,9 @@ static rpmRC _rpmtsAddRollbackElement(rpmts rollbackTransaction,
        switch(rc) {
        case RPMRC_OK:
            /* Add the install element, as we had a repackaged package */
-           rpmlog(RPMMESS_DEBUG,
+           rpmlog(RPMLOG_DEBUG,
                _("\tAdded repackaged package header: %s.\n"), rpn);
-           rpmlog(RPMMESS_DEBUG,
+           rpmlog(RPMLOG_DEBUG,
                _("\tAdded from install element %s.\n"), rpmteNEVRA(te));
            rc = rpmtsAddInstallElement(rollbackTransaction, headerLink(rph),
                (fnpyKey) rpn, 1, te->relocs);
@@ -1214,8 +1214,8 @@ static rpmRC _rpmtsAddRollbackElement(rpmts rollbackTransaction,
            /* Add the header as an erase element, we did not
             * have a repackaged package
             */
-           rpmlog(RPMMESS_DEBUG, _("\tAdded erase element.\n"));
-           rpmlog(RPMMESS_DEBUG,
+           rpmlog(RPMLOG_DEBUG, _("\tAdded erase element.\n"));
+           rpmlog(RPMLOG_DEBUG,
                _("\tAdded from install element %s.\n"), rpmteNEVRA(te));
            rc = rpmtsAddEraseElement(rollbackTransaction, h, db_instance);
            break;
@@ -1229,7 +1229,7 @@ static rpmRC _rpmtsAddRollbackElement(rpmts rollbackTransaction,
     }  break;
 
    case TR_REMOVED:
-       rpmlog(RPMMESS_DEBUG,
+       rpmlog(RPMLOG_DEBUG,
            _("Add erase element to auto-rollback transaction.\n"));
        /* See if this element has already been added.
         * If so we want to do nothing.  Compare N's for match.
@@ -1238,8 +1238,8 @@ static rpmRC _rpmtsAddRollbackElement(rpmts rollbackTransaction,
        pi = rpmtsiInit(rollbackTransaction);
        while ((p = rpmtsiNext(pi, 0)) != NULL) {
            if (!strcmp(rpmteN(p), rpmteN(te))) {
-               rpmlog(RPMMESS_DEBUG, _("\tFound existing upgrade element.\n"));
-               rpmlog(RPMMESS_DEBUG, _("\tNot adding erase element for %s.\n"),
+               rpmlog(RPMLOG_DEBUG, _("\tFound existing upgrade element.\n"));
+               rpmlog(RPMLOG_DEBUG, _("\tNot adding erase element for %s.\n"),
                        rpmteN(te));
                rc = RPMRC_OK;  
                pi = rpmtsiFree(pi);
@@ -1255,9 +1255,9 @@ static rpmRC _rpmtsAddRollbackElement(rpmts rollbackTransaction,
        switch(rc) {
        case RPMRC_OK:
            /* Add the install element */
-           rpmlog(RPMMESS_DEBUG,
+           rpmlog(RPMLOG_DEBUG,
                _("\tAdded repackaged package %s.\n"), rpn);
-           rpmlog(RPMMESS_DEBUG,
+           rpmlog(RPMLOG_DEBUG,
                _("\tAdded from erase element %s.\n"), rpmteNEVRA(te));
            rc = rpmtsAddInstallElement(rollbackTransaction, rph,
                (fnpyKey) rpn, 1, te->relocs);
@@ -1268,7 +1268,7 @@ static rpmRC _rpmtsAddRollbackElement(rpmts rollbackTransaction,
 
        case RPMRC_NOTFOUND:
            /* Just did not have a repackaged package */
-           rpmlog(RPMMESS_DEBUG,
+           rpmlog(RPMLOG_DEBUG,
                _("\tNo repackaged package...nothing to do.\n"));
            rc = RPMRC_OK;
            break;
@@ -1409,7 +1409,7 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
      * - count files.
      */
 
-rpmlog(RPMMESS_DEBUG, _("sanity checking %d elements\n"), rpmtsNElements(ts));
+rpmlog(RPMLOG_DEBUG, _("sanity checking %d elements\n"), rpmtsNElements(ts));
     ps = rpmtsProblems(ts);
     /* The ordering doesn't matter here */
     pi = rpmtsiInit(ts);
@@ -1495,7 +1495,7 @@ rpmlog(RPMMESS_DEBUG, _("sanity checking %d elements\n"), rpmtsNElements(ts));
     if (!((rpmtsFlags(ts) & (RPMTRANS_FLAG_BUILD_PROBS|RPMTRANS_FLAG_TEST))
          || (rpmpsNumProblems(ts->probs) &&
                (okProbs == NULL || rpmpsTrim(ts->probs, okProbs))))) {
-       rpmlog(RPMMESS_DEBUG, _("running pre-transaction scripts\n"));
+       rpmlog(RPMLOG_DEBUG, _("running pre-transaction scripts\n"));
        pi = rpmtsiInit(ts);
        while ((p = rpmtsiNext(pi, TR_ADDED)) != NULL) {
            if ((fi = rpmtsiFi(pi)) == NULL)
@@ -1562,7 +1562,7 @@ assert(psm != NULL);
      * calling fpLookupList only once. I'm not sure that the speedup is
      * worth the trouble though.
      */
-rpmlog(RPMMESS_DEBUG, _("computing %d file fingerprints\n"), totalFileCount);
+rpmlog(RPMLOG_DEBUG, _("computing %d file fingerprints\n"), totalFileCount);
 
     numAdded = numRemoved = 0;
     pi = rpmtsiInit(ts);
@@ -1638,7 +1638,7 @@ rpmlog(RPMMESS_DEBUG, _("computing %d file fingerprints\n"), totalFileCount);
     /* ===============================================
      * Compute file disposition for each package in transaction set.
      */
-rpmlog(RPMMESS_DEBUG, _("computing file dispositions\n"));
+rpmlog(RPMLOG_DEBUG, _("computing file dispositions\n"));
     ps = rpmtsProblems(ts);
     pi = rpmtsiInit(ts);
     while ((p = rpmtsiNext(pi, 0)) != NULL) {
@@ -1826,7 +1826,7 @@ rpmlog(RPMMESS_DEBUG, _("computing file dispositions\n"));
        rpmVSFlags ovsflags;
        rpmVSFlags vsflags;
 
-       rpmlog(RPMMESS_DEBUG,
+       rpmlog(RPMLOG_DEBUG,
            _("Creating auto-rollback transaction\n"));
 
        rollbackTransaction = rpmtsCreate();
@@ -1943,7 +1943,7 @@ assert(psm != NULL);
 
            pkgKey = rpmteAddedKey(p);
 
-           rpmlog(RPMMESS_DEBUG, "========== +++ %s %s-%s 0x%x\n",
+           rpmlog(RPMLOG_DEBUG, "========== +++ %s %s-%s 0x%x\n",
                rpmteNEVR(p), rpmteA(p), rpmteO(p), rpmteColor(p));
 
            p->h = NULL;
@@ -2130,7 +2130,7 @@ assert(psm != NULL);
        case TR_REMOVED:
            (void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_ERASE), 0);
 
-           rpmlog(RPMMESS_DEBUG, "========== --- %s %s-%s 0x%x\n",
+           rpmlog(RPMLOG_DEBUG, "========== --- %s %s-%s 0x%x\n",
                rpmteNEVR(p), rpmteA(p), rpmteO(p), rpmteColor(p));
 
            /*
@@ -2204,7 +2204,7 @@ assert(psm != NULL);
        rollbackTransaction = rpmtsFree(rollbackTransaction);
 
     if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_TEST)) {
-       rpmlog(RPMMESS_DEBUG, _("running post-transaction scripts\n"));
+       rpmlog(RPMLOG_DEBUG, _("running post-transaction scripts\n"));
        pi = rpmtsiInit(ts);
        while ((p = rpmtsiNext(pi, TR_ADDED)) != NULL) {
            int haspostscript;

diff --git a/rpmdb/db3.c b/rpmdb/db3.c
index af28667..87fe71e 100644 (file)
--- a/rpmdb/db3.c
+++ b/rpmdb/db3.c
@@ -171,7 +171,7 @@ static int db_fini(dbiIndex dbi, const char * dbhome,
     rc = cvtdberr(dbi, "dbenv->close", rc, _debug);
 
     if (dbfile)
-       rpmlog(RPMMESS_DEBUG, _("closed   db environment %s/%s\n"),
+       rpmlog(RPMLOG_DEBUG, _("closed   db environment %s/%s\n"),
                        dbhome, dbfile);
 
     if (rpmdb->db_remove_env) {
@@ -183,7 +183,7 @@ static int db_fini(dbiIndex dbi, const char * dbhome,
        xx = cvtdberr(dbi, "dbenv->remove", xx, _debug);
 
        if (dbfile)
-           rpmlog(RPMMESS_DEBUG, _("removed  db environment %s/%s\n"),
+           rpmlog(RPMLOG_DEBUG, _("removed  db environment %s/%s\n"),
                        dbhome, dbfile);
 
     }
@@ -238,7 +238,7 @@ static int db_init(dbiIndex dbi, const char * dbhome,
     if (eflags & DB_JOINENV) eflags &= DB_JOINENV;
 
     if (dbfile)
-       rpmlog(RPMMESS_DEBUG, _("opening  db environment %s/%s %s\n"),
+       rpmlog(RPMLOG_DEBUG, _("opening  db environment %s/%s %s\n"),
                dbhome, dbfile, prDbiOpenFlags(eflags, 1));
 
     /* XXX Can't do RPC w/o host. */
@@ -677,7 +677,7 @@ static int db3close(dbiIndex dbi, unsigned int flags)
        rc = cvtdberr(dbi, "db->close", rc, _printit);
        db = dbi->dbi_db = NULL;
 
-       rpmlog(RPMMESS_DEBUG, _("closed   db index       %s/%s\n"),
+       rpmlog(RPMLOG_DEBUG, _("closed   db index       %s/%s\n"),
                dbhome, (dbfile ? dbfile : rpmTagGetName(dbi->dbi_rpmtag)));
 
     }
@@ -734,7 +734,7 @@ static int db3close(dbiIndex dbi, unsigned int flags)
                rc = db->verify(db, dbf, NULL, NULL, flags);
                rc = cvtdberr(dbi, "db->verify", rc, _debug);
 
-               rpmlog(RPMMESS_DEBUG, _("verified db index       %s/%s\n"),
+               rpmlog(RPMLOG_DEBUG, _("verified db index       %s/%s\n"),
                        (dbhome ? dbhome : ""),
                        (dbfile ? dbfile : rpmTagGetName(dbi->dbi_rpmtag)));
 
@@ -945,7 +945,7 @@ static int db3open(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip)
        }
     }
 
-    rpmlog(RPMMESS_DEBUG, _("opening  db index       %s/%s %s mode=0x%x\n"),
+    rpmlog(RPMLOG_DEBUG, _("opening  db index       %s/%s %s mode=0x%x\n"),
                dbhome, (dbfile ? dbfile : rpmTagGetName(dbi->dbi_rpmtag)),
                prDbiOpenFlags(oflags, 0), dbi->dbi_mode);
 
@@ -1162,7 +1162,7 @@ static int db3open(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip)
                                        ? _("exclusive") : _("shared")),
                                dbhome, (dbfile ? dbfile : ""));
                    } else if (dbfile) {
-                       rpmlog(RPMMESS_DEBUG,
+                       rpmlog(RPMLOG_DEBUG,
                                _("locked   db index       %s/%s\n"),
                                dbhome, dbfile);
                    }

diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index bd69873..cc82389 100644 (file)
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -234,7 +234,7 @@ dbiIndex dbiOpen(rpmdb db, rpmTag rpmtag, unsigned int flags)
     default:
        _dbapi = _dbapi_wanted;
        if (_dbapi < 0 || _dbapi >= 5 || mydbvecs[_dbapi] == NULL) {
-            rpmlog(RPMMESS_DEBUG, "dbiOpen: _dbiapi failed\n");
+            rpmlog(RPMLOG_DEBUG, "dbiOpen: _dbiapi failed\n");
            return NULL;
        }
        errno = 0;
@@ -653,7 +653,7 @@ int rpmdbCheckSignals(void)
 {
     if (rpmdbCheckTerminate(0)) {
 /* sigset_t is abstract type */
-       rpmlog(RPMMESS_DEBUG, "Exiting on signal(0x%lx) ...\n", *((unsigned long *)&rpmsqCaught));
+       rpmlog(RPMLOG_DEBUG, "Exiting on signal(0x%lx) ...\n", *((unsigned long *)&rpmsqCaught));
        exit(EXIT_FAILURE);
     }
     return 0;
@@ -1485,7 +1485,7 @@ static int miFreeHeader(rpmdbMatchIterator mi, dbiIndex dbi)
            int lvl;
 
            rpmrc = (*mi->mi_hdrchk) (mi->mi_ts, data->data, data->size, &msg);
-           lvl = (rpmrc == RPMRC_FAIL ? RPMMESS_ERROR : RPMMESS_DEBUG);
+           lvl = (rpmrc == RPMRC_FAIL ? RPMMESS_ERROR : RPMLOG_DEBUG);
            rpmlog(lvl, "%s h#%8u %s",
                (rpmrc == RPMRC_FAIL ? _("miFreeHeader: skipping") : "write"),
                        mi->mi_prevoffset, (msg ? msg : "\n"));
@@ -2111,7 +2111,7 @@ if (dbiByteSwapped(dbi) == 1)
            int lvl;
 
            rpmrc = (*mi->mi_hdrchk) (mi->mi_ts, uh, uhlen, &msg);
-           lvl = (rpmrc == RPMRC_FAIL ? RPMMESS_ERROR : RPMMESS_DEBUG);
+           lvl = (rpmrc == RPMRC_FAIL ? RPMMESS_ERROR : RPMLOG_DEBUG);
            rpmlog(lvl, "%s h#%8u %s",
                (rpmrc == RPMRC_FAIL ? _("rpmdbNextIterator: skipping") : " read"),
                        mi->mi_offset, (msg ? msg : "\n"));
@@ -2451,7 +2451,7 @@ memset(data, 0, sizeof(*data));
 
     {  const char *n, *v, *r;
        (void) headerNVR(h, &n, &v, &r);
-       rpmlog(RPMMESS_DEBUG, "  --- h#%8u %s-%s-%s\n", hdrNum, n, v, r);
+       rpmlog(RPMLOG_DEBUG, "  --- h#%8u %s-%s-%s\n", hdrNum, n, v, r);
     }
 
     (void) blockSignals(db, &signalMask);
@@ -2600,11 +2600,11 @@ if (dbiByteSwapped(dbi) == 1)
 
                if (!printed) {
                    if (rpmcnt == 1 && stringvalued) {
-                       rpmlog(RPMMESS_DEBUG,
+                       rpmlog(RPMLOG_DEBUG,
                                _("removing \"%s\" from %s index.\n"),
                                (char *)key->data, rpmTagGetName(dbi->dbi_rpmtag));
                    } else {
-                       rpmlog(RPMMESS_DEBUG,
+                       rpmlog(RPMLOG_DEBUG,
                                _("removing %d entries from %s index.\n"),
                                rpmcnt, rpmTagGetName(dbi->dbi_rpmtag));
                    }
@@ -2865,7 +2865,7 @@ data->size = headerSizeof(h, HEADER_MAGIC_NO);
                    int lvl;
 
                    rpmrc = (*hdrchk) (ts, data->data, data->size, &msg);
-                   lvl = (rpmrc == RPMRC_FAIL ? RPMMESS_ERROR : RPMMESS_DEBUG);
+                   lvl = (rpmrc == RPMRC_FAIL ? RPMMESS_ERROR : RPMLOG_DEBUG);
                    rpmlog(lvl, "%s h#%8u %s",
                        (rpmrc == RPMRC_FAIL ? _("rpmdbAdd: skipping") : "  +++"),
                                hdrNum, (msg ? msg : "\n"));
@@ -3022,11 +3022,11 @@ data->size = 0;
 
                if (!printed) {
                    if (rpmcnt == 1 && stringvalued) {
-                       rpmlog(RPMMESS_DEBUG,
+                       rpmlog(RPMLOG_DEBUG,
                                _("adding \"%s\" to %s index.\n"),
                                (char *)key->data, rpmTagGetName(dbi->dbi_rpmtag));
                    } else {
-                       rpmlog(RPMMESS_DEBUG,
+                       rpmlog(RPMLOG_DEBUG,
                                _("adding %d entries to %s index.\n"),
                                rpmcnt, rpmTagGetName(dbi->dbi_rpmtag));
                    }
@@ -3418,7 +3418,7 @@ static int rpmdbMoveDatabase(const char * prefix,
        const char * mdb1 = "/etc/rpm/macros.db1";
        struct stat st;
        if (!stat(mdb1, &st) && S_ISREG(st.st_mode) && !unlink(mdb1))
-           rpmlog(RPMMESS_DEBUG,
+           rpmlog(RPMLOG_DEBUG,
                _("removing %s after successful db3 rebuild.\n"), mdb1);
     }
 #endif
@@ -3450,7 +3450,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts,
     tfn = rpmGetPath("%{?_dbpath}", NULL);
     if (!(tfn && tfn[0] != '\0'))
     {
-       rpmlog(RPMMESS_DEBUG, _("no dbpath has been set"));
+       rpmlog(RPMLOG_DEBUG, _("no dbpath has been set"));
        rc = 1;
        goto exit;
     }
@@ -3476,7 +3476,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts,
        newdbpath += strlen(prefix) - 1;
     tfn = _free(tfn);
 
-    rpmlog(RPMMESS_DEBUG, _("rebuilding database %s into %s\n"),
+    rpmlog(RPMLOG_DEBUG, _("rebuilding database %s into %s\n"),
        rootdbpath, newrootdbpath);
 
     if (!access(newrootdbpath, F_OK)) {
@@ -3486,7 +3486,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts,
        goto exit;
     }
 
-    rpmlog(RPMMESS_DEBUG, _("creating directory %s\n"), newrootdbpath);
+    rpmlog(RPMLOG_DEBUG, _("creating directory %s\n"), newrootdbpath);
     if (Mkdir(newrootdbpath, 0755)) {
        rpmlog(RPMERR_MKDIR, _("creating directory %s: %s\n"),
              newrootdbpath, strerror(errno));
@@ -3497,7 +3497,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts,
 
     _rebuildinprogress = 0;
 
-    rpmlog(RPMMESS_DEBUG, _("opening old database with dbapi %d\n"),
+    rpmlog(RPMLOG_DEBUG, _("opening old database with dbapi %d\n"),
                _dbapi);
     if (openDatabase(prefix, dbpath, _dbapi, &olddb, O_RDONLY, 0644, 
                     RPMDB_FLAG_MINIMAL)) {
@@ -3506,7 +3506,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts,
     }
     _dbapi = olddb->db_api;
     _rebuildinprogress = 1;
-    rpmlog(RPMMESS_DEBUG, _("opening new database with dbapi %d\n"),
+    rpmlog(RPMLOG_DEBUG, _("opening new database with dbapi %d\n"),
                _dbapi_rebuild);
     (void) rpmDefineMacro(NULL, "_rpmdb_rebuild %{nil}", -1);
     if (openDatabase(prefix, newdbpath, _dbapi_rebuild, &newdb, O_RDWR | O_CREAT, 0644, 0)) {
@@ -3607,7 +3607,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts,
 
 exit:
     if (removedir && !(rc == 0 && nocleanup)) {
-       rpmlog(RPMMESS_DEBUG, _("removing directory %s\n"), newrootdbpath);
+       rpmlog(RPMLOG_DEBUG, _("removing directory %s\n"), newrootdbpath);
        if (Rmdir(newrootdbpath))
            rpmlog(RPMMESS_ERROR, _("failed to remove directory %s: %s\n"),
                        newrootdbpath, strerror(errno));

diff --git a/rpmdb/sqlite.c b/rpmdb/sqlite.c
index 64c5107..3955a9b 100644 (file)
--- a/rpmdb/sqlite.c
+++ b/rpmdb/sqlite.c
@@ -742,7 +742,7 @@ enterChroot(dbi);
 
        (void) sqlite3_close(sqldb->db);
 
-       rpmlog(RPMMESS_DEBUG, _("closed   sql db         %s\n"),
+       rpmlog(RPMLOG_DEBUG, _("closed   sql db         %s\n"),
                dbi->dbi_subfile);
 
        dbi->dbi_stats = _free(dbi->dbi_stats);
@@ -832,7 +832,7 @@ enterChroot(dbi);
        
     dbfname = rpmGenPath(dbhome, dbi->dbi_file, NULL);
 
-    rpmlog(RPMMESS_DEBUG, _("opening  sql db         %s (%s) mode=0x%x\n"),
+    rpmlog(RPMLOG_DEBUG, _("opening  sql db         %s (%s) mode=0x%x\n"),
                dbfname, dbi->dbi_subfile, dbi->dbi_mode);
 
     /* Open the Database */
@@ -851,7 +851,7 @@ enterChroot(dbi);
     dbi->dbi_db = (DB *)sqldb;
 
     if (sql_errcode != NULL) {
-      rpmlog(RPMMESS_DEBUG, "Unable to open database: %s\n", sql_errcode);
+      rpmlog(RPMLOG_DEBUG, "Unable to open database: %s\n", sql_errcode);
       rc = EINVAL;
     }
 
@@ -1213,7 +1213,7 @@ assert(scp->av != NULL);
 
     } else {
        if ( sql_rc ) {
-           rpmlog(RPMMESS_DEBUG, "db_info failed %s (%d)\n",
+           rpmlog(RPMLOG_DEBUG, "db_info failed %s (%d)\n",
                scp->pzErrmsg, sql_rc);
        }
        rpmlog(RPMMESS_WARNING, "Unable to determine DB endian.\n");
@@ -1344,11 +1344,11 @@ enterChroot(dbi);
 assert(scp->av != NULL);
        nkeys = strtol(scp->av[1], NULL, 10);
 
-       rpmlog(RPMMESS_DEBUG, "  stat on %s nkeys %ld\n",
+       rpmlog(RPMLOG_DEBUG, "  stat on %s nkeys %ld\n",
                dbi->dbi_subfile, nkeys);
     } else {
        if ( rc ) {
-           rpmlog(RPMMESS_DEBUG, "stat failed %s (%d)\n",
+           rpmlog(RPMLOG_DEBUG, "stat failed %s (%d)\n",
                scp->pzErrmsg, rc);
        }
     }

diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index 1f7fa55..5bb5f70 100644 (file)
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -1730,7 +1730,7 @@ int rpmioMkpath(const char * path, mode_t mode, uid_t uid, gid_t gid)
     }
     rc = 0;
     if (created)
-       rpmlog(RPMMESS_DEBUG, "created directory(s) %s mode 0%o\n",
+       rpmlog(RPMLOG_DEBUG, "created directory(s) %s mode 0%o\n",
                        path, mode);
     return rc;
 }

diff --git a/rpmio/url.c b/rpmio/url.c
index baa10b2..90e15b4 100644 (file)
--- a/rpmio/url.c
+++ b/rpmio/url.c
@@ -254,7 +254,7 @@ int urlGetFile(const char * url, const char * dest)
        
     sfd = Fopen(url, "r.ufdio");
     if (sfd == NULL || Ferror(sfd)) {
-       rpmlog(RPMMESS_DEBUG, _("failed to open %s: %s\n"), url, Fstrerror(sfd));
+       rpmlog(RPMLOG_DEBUG, _("failed to open %s: %s\n"), url, Fstrerror(sfd));
        rc = FTPERR_UNKNOWN;
        goto exit;
     }
@@ -274,7 +274,7 @@ if (_url_debug)
 fprintf(stderr, "*** urlGetFile sfd %p %s tfd %p %s\n", sfd, url, (tfd ? tfd : NULL), dest);
     if (tfd == NULL || Ferror(tfd)) {
        /* XXX Fstrerror */
-       rpmlog(RPMMESS_DEBUG, _("failed to create %s: %s\n"), dest, Fstrerror(tfd));
+       rpmlog(RPMLOG_DEBUG, _("failed to create %s: %s\n"), dest, Fstrerror(tfd));
        rc = FTPERR_UNKNOWN;
        goto exit;
     }

diff --git a/tools/rpmcache.c b/tools/rpmcache.c
index 3a8d92d..a895262 100644 (file)
--- a/tools/rpmcache.c
+++ b/tools/rpmcache.c
@@ -187,7 +187,7 @@ static int ftsStashLatest(FTSENT * fts, rpmts ts)
     int ec = -1;       /* assume not found */
     int i = 0;
 
-    rpmlog(RPMMESS_DEBUG, "============== %s\n", fts->fts_accpath);
+    rpmlog(RPMLOG_DEBUG, "============== %s\n", fts->fts_accpath);
 
     /* Read header from file. */
     {   FD_t fd = Fopen(fts->fts_accpath, "r");
@@ -502,7 +502,7 @@ static void initGlobs(rpmts ts, const char ** argv)
        bhglobs[i].patterns[0] = pattern;
        bhglobs[i].fnflags = (FNM_PATHNAME | FNM_PERIOD | FNM_EXTMATCH);
        if (bhglobs[i].patterns[0] != NULL)
-           rpmlog(RPMMESS_DEBUG, "\t%d \"%s\"\n",
+           rpmlog(RPMLOG_DEBUG, "\t%d \"%s\"\n",
                i, bhglobs[i].patterns[0]);
     }
 }