Sanity.

CVS patchset: 6652
CVS date: 2003/03/05 00:13:11

16 files changed, 39 insertions, 80 deletions

diff --git a/Makefile.am b/Makefile.am
index ae463f6a8..bca0ca02c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 LINT = splint
 
 EXTRA_DIST = CHANGES CREDITS Doxyheader GROUPS README.amiga INSTALL \
-	RPM-PGP-KEY RPM-GPG-KEY BETA-GPG-KEY \
+	RPM-GPG-KEY RPM-PGP-KEY BETA-GPG-KEY \
 	autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
 	config.site db db3/configure gendiff installplatform platform* \
 	xmlspec/Makefile xmlspec/*.c xmlspec/*.h \
diff --git a/build/rpmspec.h b/build/rpmspec.h
index bfd445805..bcbf73f35 100644
--- a/build/rpmspec.h
+++ b/build/rpmspec.h
@@ -151,7 +151,8 @@ struct Spec_s {
 /*@refcounted@*/
     rpmfi sourceCpioList;
 
-/*@dependent@*/ /*@null@*/ MacroContext macros;
+/*@dependent@*/ /*@null@*/
+    MacroContext macros;
 
 /*@only@*/
     StringBuf prep;		/*!< %prep scriptlet. */
@@ -240,10 +241,10 @@ extern "C" {
  * @return		0 on success, else no. of failures
  */
 int rpmspecQuery(rpmts ts, QVA_t qva, const char * arg)
-        /*@globals rpmGlobalMacroContext,
-                fileSystem, internalState @*/
-        /*@modifies ts, qva, rpmGlobalMacroContext,
-                fileSystem, internalState @*/;
+	/*@globals rpmGlobalMacroContext,
+		fileSystem, internalState @*/
+	/*@modifies ts, qva, rpmGlobalMacroContext,
+		fileSystem, internalState @*/;
 
 /** \ingroup rpmbuild
  */
diff --git a/lib/depends.c b/lib/depends.c
index acd16c9ef..f656c706b 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -1612,7 +1612,7 @@ int rpmtsCheck(rpmts ts)
 	rpmds provides;
 
 /*@-nullpass@*/	/* FIX: rpmts{A,O} can return null. */
-        rpmMessage(RPMMESS_DEBUG,  "========== +++ %s %s/%s 0x%x\n",
+	rpmMessage(RPMMESS_DEBUG,  "========== +++ %s %s/%s 0x%x\n",
 		rpmteNEVR(p), rpmteA(p), rpmteO(p), rpmteColor(p));
 /*@=nullpass@*/
 	rc = checkPackageDeps(ts, rpmteNEVR(p),
diff --git a/lib/fsm.c b/lib/fsm.c
index af6f2272a..94165dfa0 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -389,7 +389,7 @@ static int saveHardLink(/*@special@*/ /*@partial@*/ FSM_t fsm)
 	/*@defines fsm->li @*/
 	/*@releases fsm->path @*/
 	/*@globals errno, fileSystem, internalState @*/
-	/*@modifies errno, fsm, fileSystem, internalState @*/
+	/*@modifies fsm, errno, fileSystem, internalState @*/
 {
     struct stat * st = &fsm->sb;
     int rc = 0;
@@ -2215,7 +2215,6 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
 	    rc = CPIOERR_OPEN_FAILED;
 	    break;
 	}
-/*@=voidabstract@*/
 	if (_fsm_debug && (stage & FSM_SYSCALL))
 	    rpmMessage(RPMMESS_DEBUG, " %8s (%s, \"r\") rfd %p rdbuf %p\n", cur,
 		fsm->path, fsm->rfd, fsm->rdbuf);
@@ -2295,7 +2294,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
     case FA_ERASE:	return "erase";
     case FA_SKIPNSTATE: return "skipnstate";
     case FA_SKIPNETSHARED: return "skipnetshared";
-    case FA_SKIPCOLOR: return "skipcolor";
+    case FA_SKIPCOLOR:	return "skipcolor";
     default:		return "???";
     }
     /*@notreached@*/
diff --git a/lib/rpmal.c b/lib/rpmal.c
index c825dbe22..bf0c168e9 100644
--- a/lib/rpmal.c
+++ b/lib/rpmal.c
@@ -789,7 +789,7 @@ rpmalAllSatisfiesDepend(const rpmal al, const rpmds ds, alKey * keyp)
     if (ret)
 	ret[found] = NULL;
 
-/*@-nullstate@*/ /* FIX: *kep may be NULL */
+/*@-nullstate@*/ /* FIX: *keyp may be NULL */
     return ret;
 /*@=nullstate@*/
 }
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index d4970c3ef..64b3c17e5 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -937,7 +937,6 @@ IDTX IDTXload(rpmts ts, rpmTag tag)
     HGE_t hge = (HGE_t) headerGetEntry;
     Header h;
 
-rpmMessage(RPMMESS_DEBUG, "IDTXload(%p, %d)\n", ts, tag);
     /*@-branchstate@*/
     mi = rpmtsInitIterator(ts, tag, NULL, 0);
 #ifdef	NOTYET
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 8c83df2b5..46140f024 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -442,7 +442,7 @@ typedef	enum rpmfileAttrs_e {
     RPMFILE_README	= (1 <<  8),	/*!< from %%readme */
     RPMFILE_EXCLUDE	= (1 <<  9),	/*!< from %%exclude */
     RPMFILE_UNPATCHED	= (1 << 10),	/*!< placeholder (SuSE) */
-    RPMFILE_PUBKEY	= (1 << 11),	/*!< from %%pubkey */
+    RPMFILE_PUBKEY	= (1 << 11)	/*!< from %%pubkey */
 } rpmfileAttrs;
 
 #define	RPMFILE_ALL	~(RPMFILE_NONE)
diff --git a/lib/rpmts.c b/lib/rpmts.c
index b39e0e400..e2809f3df 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -778,8 +778,8 @@ void rpmtsSetScriptFd(rpmts ts, FD_t scriptFd)
 /*@+voidabstract@*/
 	if (scriptFd != NULL)
 	    ts->scriptFd = fdLink((void *)scriptFd, "rpmtsSetScriptFd");
-    }
 /*@=voidabstract@*/
+    }
 }
 
 int rpmtsChrootDone(rpmts ts)
@@ -978,8 +978,8 @@ 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;
-        rpmMessage(RPMMESS_DEBUG, _("%5d 0x%04x %5u %12ld %12ld %s\n"),
-                i, (unsigned) dsi->dev, (unsigned) dsi->bsize,
+	rpmMessage(RPMMESS_DEBUG, _("%5d 0x%04x %5u %12ld %12ld %s\n"),
+		i, (unsigned) dsi->dev, (unsigned) dsi->bsize,
 		(signed long) dsi->bavail, (signed long) dsi->iavail,
 		ts->filesystems[i]);
     }
diff --git a/lib/transaction.c b/lib/transaction.c
index aff7f393b..c4a21b167 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1023,7 +1023,6 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
     if (rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERS)
 	(void) rpmtsSetFlags(ts, (rpmtsFlags(ts) | _noTransTriggers));
 
-    /* XXX MULTILIB is broken, as packages can and do execute /sbin/ldconfig. */
     if (rpmtsFlags(ts) & RPMTRANS_FLAG_JUSTDB)
 	(void) rpmtsSetFlags(ts, (rpmtsFlags(ts) | _noTransScripts | _noTransTriggers));
 
diff --git a/macros.in b/macros.in
index 09ddc875e..6740b88a0 100644
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.137 2003/01/31 22:55:28 jbj Exp $
+# $Id: macros.in,v 1.138 2003/03/05 00:13:11 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -339,6 +339,8 @@ package or when debugging this package.\
 #
 # Note: Used iff _use_internal_dependency_generator is non-zero. The
 # helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires).
+#%__perl_provides	/usr/lib/rpm/perldeps --provides
+#%__perl_requires	/usr/lib/rpm/perldeps --requires
 %__perl_provides	@RPMCONFIGDIR@/perl.prov
 %__perl_requires	@RPMCONFIGDIR@/perl.req
 
diff --git a/python/rpmrc-py.c b/python/rpmrc-py.c
index 25068f30d..a2aa860bb 100644
--- a/python/rpmrc-py.c
+++ b/python/rpmrc-py.c
@@ -64,34 +64,6 @@ PyObject * rpmrc_DelMacro(/*@unused@*/ PyObject * self, PyObject * args)
 }
 
 #if Py_TPFLAGS_HAVE_ITER	/* XXX backport to python-1.5.2 */
-
-/**
- */
-static PyObject *
-rpmrc_getstate(rpmrcObject *s, PyObject *args)
-	/*@*/
-{
-    if (!PyArg_ParseTuple(args, ":getstate"))
-	return NULL;
-    return PyInt_FromLong(s->state);
-}
-
-/**
- */
-static PyObject *
-rpmrc_setstate(rpmrcObject *s, PyObject *args)
-	/*@globals _Py_NoneStruct @*/
-	/*@modifies s, _Py_NoneStruct @*/
-{
-    int state;
-
-    if (!PyArg_ParseTuple(args, "i:setstate", &state))
-	return NULL;
-    s->state = state;
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
 /**
  */
 static void rpmrc_dealloc(PyObject * s)
@@ -277,15 +249,6 @@ fprintf(stderr, "*** rpmrc_next(%p[%s],%p)\n", s, lbl(s), args);
     return NULL;
 }
 
-/*@-fullinitblock@*/
-/*@unchecked@*/ /*@observer@*/
-static PyMemberDef rpmrc_members[] = {
-    {"state", T_INT, offsetof(rpmrcObject, state), READONLY,
-         "an int variable for demonstration purposes"},
-    {0}
-};
-/*@=fullinitblock@*/
-
 /** \ingroup python
  */
 static int rpmrc_init(PyObject * s, PyObject *args, PyObject *kwds)
@@ -295,7 +258,6 @@ if (_rc_debug)
 fprintf(stderr, "*** rpmrc_init(%p[%s],%p,%p)\n", s, lbl(s), args, kwds);
     if (PyDict_Type.tp_init(s, args, kwds) < 0)
 	return -1;
-    ((rpmrcObject *)s)->state = 0;
     return 0;
 }
 
@@ -353,10 +315,6 @@ static struct PyMethodDef rpmrc_methods[] = {
     { "delMacro",	(PyCFunction) rpmrc_DelMacro, METH_VARARGS,
 	NULL },
 #if Py_TPFLAGS_HAVE_ITER	/* XXX backport to python-1.5.2 */
-    { "getstate",	(PyCFunction) rpmrc_getstate, METH_VARARGS,
-	"getstate() -> state"},
-    { "setstate",	(PyCFunction) rpmrc_setstate, METH_VARARGS,
-	"setstate(state)"},
     { "next",		(PyCFunction) rpmrc_next,     METH_VARARGS,
 	"next() -- get the next value, or raise StopIteration"},
 #endif
@@ -398,7 +356,7 @@ PyTypeObject rpmrc_Type = {
 	rpmrc_iter,			/* tp_iter */
 	rpmrc_iternext,			/* tp_iternext */
 	rpmrc_methods,			/* tp_methods */
-	rpmrc_members,			/* tp_members */
+	0,				/* tp_members */
 	0,				/* tp_getset */
 	&PyDict_Type,			/* tp_base */
 	0,				/* tp_dict */
diff --git a/python/rpmrc-py.h b/python/rpmrc-py.h
index 4ab119930..4786993ce 100644
--- a/python/rpmrc-py.h
+++ b/python/rpmrc-py.h
@@ -14,7 +14,6 @@ typedef struct rpmrcObject_s rpmrcObject;
 struct rpmrcObject_s {
 #if Py_TPFLAGS_HAVE_ITER	/* XXX backport to python-1.5.2 */
     PyDictObject dict;
-    int state;
 #else
     PyObject_HEAD
 #endif
diff --git a/python/rpmte-py.c b/python/rpmte-py.c
index cf42cfeda..31556ddbe 100644
--- a/python/rpmte-py.c
+++ b/python/rpmte-py.c
@@ -295,7 +295,7 @@ rpmte_FI(rpmteObject * s, PyObject * args)
 /*@unchecked@*/ /*@observer@*/
 static struct PyMethodDef rpmte_methods[] = {
     {"Debug",	(PyCFunction)rpmte_Debug,	METH_VARARGS,
-        NULL},
+	NULL},
     {"Type",	(PyCFunction)rpmte_TEType,	METH_VARARGS,
 "te.Type() -> Type\n\
 - Return element type (rpm.TR_ADDED | rpm.TR_REMOVED).\n" },
@@ -321,27 +321,27 @@ static struct PyMethodDef rpmte_methods[] = {
 "te.NEVR() -> NEVR\n\
 - Return element name-version-release.\n" },
     {"Color",(PyCFunction)rpmte_Color,		METH_VARARGS,
-        NULL},
+	NULL},
     {"PkgFileSize",(PyCFunction)rpmte_PkgFileSize,	METH_VARARGS,
-        NULL},
+	NULL},
     {"Depth",	(PyCFunction)rpmte_Depth,	METH_VARARGS,
-        NULL},
+	NULL},
     {"Npreds",	(PyCFunction)rpmte_Npreds,	METH_VARARGS,
-        NULL},
+	NULL},
     {"Degree",	(PyCFunction)rpmte_Degree,	METH_VARARGS,
-        NULL},
+	NULL},
     {"Parent",	(PyCFunction)rpmte_Parent,	METH_VARARGS,
-        NULL},
+	NULL},
     {"Tree",	(PyCFunction)rpmte_Tree,	METH_VARARGS,
-        NULL},
+	NULL},
     {"AddedKey",(PyCFunction)rpmte_AddedKey,	METH_VARARGS,
-        NULL},
+	NULL},
     {"DependsOnKey",(PyCFunction)rpmte_DependsOnKey,	METH_VARARGS,
-        NULL},
+	NULL},
     {"DBOffset",(PyCFunction)rpmte_DBOffset,	METH_VARARGS,
-        NULL},
-    {"Key",	(PyCFunction)rpmte_Key,	METH_VARARGS,
-        NULL},
+	NULL},
+    {"Key",	(PyCFunction)rpmte_Key,		METH_VARARGS,
+	NULL},
     {"DS",	(PyCFunction)rpmte_DS,		METH_VARARGS,
 "te.DS(TagN) -> DS\n\
 - Return the TagN dependency set (or None). TagN is one of\n\
@@ -357,8 +357,8 @@ static struct PyMethodDef rpmte_methods[] = {
 
 static int
 rpmte_print(rpmteObject * s, FILE * fp, /*@unused@*/ int flags)
-        /*@globals fileSystem @*/
-        /*@modifies fp, fileSystem @*/
+	/*@globals fileSystem @*/
+	/*@modifies fp, fileSystem @*/
 {
     const char * tstr;
     if (!(s && s->te))
diff --git a/rpmdb/header_internal.h b/rpmdb/header_internal.h
index 2f0f33de3..a020ab8cc 100644
--- a/rpmdb/header_internal.h
+++ b/rpmdb/header_internal.h
@@ -57,7 +57,8 @@ struct headerToken {
     struct HV_s hv;		/*!< Header public methods. */
 /*@only@*/ /*@null@*/
     void * blob;		/*!< Header region blob. */
-/*@owned@*/ indexEntry index;	/*!< Array of tags. */
+/*@owned@*/
+    indexEntry index;		/*!< Array of tags. */
     int indexUsed;		/*!< Current size of tag array. */
     int indexAlloced;		/*!< Allocated size of tag array. */
     int flags;
diff --git a/rpmdb/legacy.h b/rpmdb/legacy.h
index 17737fbfb..5a4fcd914 100644
--- a/rpmdb/legacy.h
+++ b/rpmdb/legacy.h
@@ -59,7 +59,7 @@ void rpmfiBuildFNames(Header h, rpmTag tagN,
 	/*@modifies *fnp, *fcp @*/;
 
 /**
- * Convert (dirname,basename,dirindex) tags to absolute path tags.
+ * Convert (dirname,basename,dirindex) tags to absolute path tag.
  * @param h		header
  */
 void expandFilelist(Header h)
diff --git a/tools/.cvsignore b/tools/.cvsignore
index d559f96a7..86fce0e2f 100644
--- a/tools/.cvsignore
+++ b/tools/.cvsignore
@@ -11,8 +11,9 @@ javadeps
 rpmarchive
 rpmcache
 rpmdeps
-rpmheader
+rpmfile
 rpmgraph
+rpmheader
 rpminject
 rpmlead
 rpmsort