diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-09-03 17:57:54 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-09-03 17:57:54 +0300 |
| commit | f9e641a65c1644217f8487e6a38df9a7ba062303 (patch) | |
| tree | 4a6afe3547fb30ffaee67826407697b179d38f97 /build | |
| parent | 09bcd97b3a17609f97d82aed9f93b5c5c78bac1a (diff) | |
| parent | cec13226210a83fecdefbd21d0e81c640c23990c (diff) | |
| download | rpm-f9e641a65c1644217f8487e6a38df9a7ba062303.tar.gz rpm-f9e641a65c1644217f8487e6a38df9a7ba062303.tar.bz2 rpm-f9e641a65c1644217f8487e6a38df9a7ba062303.zip | |
Automated merge with file:/home/pmatilai/repos/rpm-whitespace
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile.am | 22 | ||||
| -rw-r--r-- | build/files.c | 24 | ||||
| -rw-r--r-- | build/rpmfc.h | 1 |
3 files changed, 3 insertions, 44 deletions
diff --git a/build/Makefile.am b/build/Makefile.am index 15857eb12..a09cf8a9d 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -1,7 +1,5 @@ # Makefile for rpmbuild library. -LINT = splint - AM_CPPFLAGS = -I. \ -I$(top_srcdir) \ -I$(top_srcdir)/lib \ @@ -28,20 +26,6 @@ librpmbuild_la_LDFLAGS = -release 4.4 \ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ - @WITH_LIBELF_LIB@ - -clean-local: - rm -f *.o - -#BUILT_SOURCES = rpmbuild.lcd - -rpmbuild.lcd: Makefile.am ${librpmbuild_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS} - -lclint ${DEFS} ${AM_CPPFLAGS} ${librpmbuild_la_SOURCES} -dump $@ 2>/dev/null - -.PHONY: sources -sources: - @echo $(librpmbuild_la_SOURCES:%=build/%) - -.PHONY: lint -lint: - $(LINT) ${DEFS} ${AM_CPPFLAGS} ${librpmbuild_la_SOURCES} + @WITH_POPT_LIB@ \ + @WITH_LIBELF_LIB@ \ + @WITH_MAGIC_LIB@ diff --git a/build/files.c b/build/files.c index c3ff036ca..25adeac07 100644 --- a/build/files.c +++ b/build/files.c @@ -23,8 +23,6 @@ #define _RPMFI_INTERNAL #include "rpmfi.h" -#include "rpmsx.h" - #define _RPMTE_INTERNAL #include "rpmte.h" @@ -940,9 +938,6 @@ static int parseForSimple(/*@unused@*/Spec spec, Package pkg, char * buf, } break; } -#if defined(__LCLINT__) - assert(s != NULL); -#endif /* Set flags for virtual file attributes */ { VFA_t *vfa; @@ -1136,8 +1131,6 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl, int apathlen = 0; int dpathlen = 0; int skipLen = 0; - rpmsx sx = NULL; - const char * sxfn; size_t fnlen; FileListRec flp; char buf[BUFSIZ]; @@ -1154,10 +1147,6 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl, skipLen += strlen(fl->prefix); } - sxfn = rpmGetPath("%{?_build_file_context_path}", NULL); - if (sxfn != NULL && *sxfn != '\0') - sx = rpmsxNew(sxfn); - for (i = 0, flp = fl->fileList; i < fl->fileListRecsUsed; i++, flp++) { const char *s; @@ -1337,20 +1326,7 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl, (void) headerAddOrAppendEntry(h, RPMTAG_FILEFLAGS, RPM_INT32_TYPE, &(flp->flags), 1); - /* Add file security context to package. */ -/*@-branchstate@*/ - if (sx != NULL) { - mode_t fmode = (uint_16)flp->fl_mode; - s = rpmsxFContext(sx, flp->fileURL, fmode); - if (s == NULL) s = ""; - (void) headerAddOrAppendEntry(h, RPMTAG_FILECONTEXTS, RPM_STRING_ARRAY_TYPE, - &s, 1); - } -/*@=branchstate@*/ - } - sx = rpmsxFree(sx); - sxfn = _free(sxfn); (void) headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE, &(fl->totalFileSize), 1); diff --git a/build/rpmfc.h b/build/rpmfc.h index b40801246..f7405c9b6 100644 --- a/build/rpmfc.h +++ b/build/rpmfc.h @@ -1,7 +1,6 @@ #ifndef _H_RPMFC_ #define _H_RPMFC_ -#undef FILE_RCSID #include "magic.h" /*@-exportlocal@*/ |