sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted rpmTagTable changes

Browse Source
This commit is contained in:
Дмитрий Левин 2005-10-19 17:45:39 +00:00
parent 6e6ebb00f1
commit a2310ac49c
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rpmlib.h
View File

@ -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@*/
/**

7
rpmdb/Makefile.am
View File

@ -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