further removed RPMDBI_DEPENDS

This commit is contained in:
Alexey Tourbin 2010-07-05 12:06:28 +04:00
parent c6943fb0f2
commit 994c5675a8
4 changed files with 1 additions and 12 deletions

View File

@ -220,7 +220,7 @@ extern const struct headerSprintfExtension_s rpmHeaderFormats[];
* Pseudo-tags used by the rpmdb iterator API.
*/
#define RPMDBI_PACKAGES 0 /*!< Installed package headers. */
#define RPMDBI_DEPENDS 1 /*!< Dependency resolution cache. */
#define ___DBI_DEPENDS 1 /*!< Dependency resolution cache. */
#define RPMDBI_LABEL 2 /*!< Fingerprint search marker. */
#define RPMDBI_ADDED 3 /*!< Added package headers. */
#define RPMDBI_REMOVED 4 /*!< Removed package headers. */

View File

@ -504,7 +504,6 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag)
/*@-sizeoftype@*/
switch (rpmtag) {
case RPMDBI_PACKAGES:
case RPMDBI_DEPENDS:
dbi->dbi_jlen = 1 * sizeof(int_32);
break;
default:

View File

@ -51,7 +51,6 @@ static int _rebuildinprogress = 0;
const int dbiTags[] = {
RPMDBI_PACKAGES,
RPMDBI_DEPENDS, /* XXX for depends.c */
RPMTAG_NAME,
RPMTAG_BASENAMES,
RPMTAG_GROUP,
@ -932,7 +931,6 @@ static int openDatabase(/*@null@*/ const char * prefix,
case RPMDBI_AVAILABLE:
case RPMDBI_ADDED:
case RPMDBI_REMOVED:
case RPMDBI_DEPENDS:
continue;
/*@notreached@*/ /*@switchbreak@*/ break;
default:
@ -2345,7 +2343,6 @@ int rpmdbRemove(rpmdb db, /*@unused@*/ int rid, unsigned int hdrNum)
case RPMDBI_AVAILABLE:
case RPMDBI_ADDED:
case RPMDBI_REMOVED:
case RPMDBI_DEPENDS:
continue;
/*@notreached@*/ /*@switchbreak@*/ break;
case RPMDBI_PACKAGES:
@ -2663,7 +2660,6 @@ int rpmdbAdd(rpmdb db, int iid, Header h)
case RPMDBI_AVAILABLE:
case RPMDBI_ADDED:
case RPMDBI_REMOVED:
case RPMDBI_DEPENDS:
continue;
/*@notreached@*/ /*@switchbreak@*/ break;
case RPMDBI_PACKAGES:
@ -3100,7 +3096,6 @@ static int rpmdbMoveDatabase(const char * prefix,
case RPMDBI_AVAILABLE:
case RPMDBI_ADDED:
case RPMDBI_REMOVED:
case RPMDBI_DEPENDS:
continue;
/*@notreached@*/ /*@switchbreak@*/ break;
default:

View File

@ -17,9 +17,6 @@ const char * tagName(int tag)
case RPMDBI_PACKAGES:
strcpy(nameBuf, "Packages");
break;
case RPMDBI_DEPENDS:
strcpy(nameBuf, "Depends");
break;
case RPMDBI_ADDED:
strcpy(nameBuf, "Added");
break;
@ -54,8 +51,6 @@ int tagValue(const char * tagstr)
if (!xstrcasecmp(tagstr, "Packages"))
return RPMDBI_PACKAGES;
if (!xstrcasecmp(tagstr, "Depends"))
return RPMDBI_DEPENDS;
if (!xstrcasecmp(tagstr, "Added"))
return RPMDBI_ADDED;
if (!xstrcasecmp(tagstr, "Removed"))