From a2310ac49c3355f64ebb49041364e333b02265bd Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Wed, 19 Oct 2005 17:45:39 +0000 Subject: [PATCH] reverted rpmTagTable changes --- lib/rpmlib.h | 2 +- rpmdb/Makefile.am | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/rpmlib.h b/lib/rpmlib.h index be22363..148e52e 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -196,7 +196,7 @@ int rpmPackageGetEntry(void *leadp, Header sigs, Header h, */ /*@-redecl@*/ /*@observer@*/ /*@unchecked@*/ -extern const struct headerTagTableEntry_s * rpmTagTable; +extern const struct headerTagTableEntry_s rpmTagTable[]; /*@=redecl@*/ /** diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am index 283714a..166192c 100644 --- a/rpmdb/Makefile.am +++ b/rpmdb/Makefile.am @@ -36,16 +36,13 @@ tagtbl.c: Makefile.am $(top_srcdir)/lib/rpmlib.h @echo '#include "rpmlib.h"' >> $@ @echo '' >> $@ @echo '/*@observer@*/ /*@unchecked@*/' >> $@ - @echo 'static const struct headerTagTableEntry_s rpmTagTbl[] = {' >> $@ + @echo 'const struct headerTagTableEntry_s rpmTagTable[] = {' >> $@ ${AWK} '/(RPMTAG_[A-Z0-9]*)[ \t]+([0-9]*)/ && !/internal/ { if ($$2 == "=") { printf("\t{ \"%s\", %s },\n", $$1, $$3) } else { printf("\t{ \"%s\", %s },\n", $$2, $$3) } }' < $(top_srcdir)/lib/rpmlib.h >> $@ @echo ' { NULL, 0 }' >> $@ @echo '};' >> $@ @echo '' >> $@ - @echo '/*@observer@*/ /*@unchecked@*/' >> $@ - @echo 'const struct headerTagTableEntry_s * rpmTagTable = rpmTagTbl;' >> $@ - @echo '' >> $@ @echo '/*@unchecked@*/' >> $@ - @echo 'const int rpmTagTableSize = sizeof(rpmTagTbl) / sizeof(rpmTagTbl[0]) - 1;' >> $@ + @echo 'const int rpmTagTableSize = sizeof(rpmTagTable) / sizeof(rpmTagTable[0]) - 1;' >> $@ @echo '/*@=bounds@*/' >> $@ BUILT_SOURCES = tagtbl.c