diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-09-03 15:23:38 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-09-03 15:23:38 +0300 |
| commit | b23a4d294b2ab1d3c62ce7a09fe7bb2494314339 (patch) | |
| tree | a6d21a80a6c488e082189e230a42b1688812f65d /lib | |
| parent | 3acfe8f031654164c238cc70c5d9977932bf99a2 (diff) | |
| parent | 5b786f94bcd9c89aae3b19e11782f5f4d811c359 (diff) | |
| download | rpm-b23a4d294b2ab1d3c62ce7a09fe7bb2494314339.tar.gz rpm-b23a4d294b2ab1d3c62ce7a09fe7bb2494314339.tar.bz2 rpm-b23a4d294b2ab1d3c62ce7a09fe7bb2494314339.zip | |
Automated merge with ssh://login.linux.duke.edu//home/groups/rpm/hg/rpm
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/depends.c | 6 | ||||
| -rw-r--r-- | lib/poptALL.c | 2 | ||||
| -rw-r--r-- | lib/rpmrc.c | 3 | ||||
| -rw-r--r-- | lib/rpmts.c | 12 |
4 files changed, 6 insertions, 17 deletions
diff --git a/lib/depends.c b/lib/depends.c index 39150d3a7..989cb6c21 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -474,7 +474,7 @@ static int unsatisfiedDepend(rpmts ts, rpmds dep, int adding) retry: rc = 0; /* assume dependency is satisfied */ -#if defined(DYING) || defined(__LCLINT__) +#if defined(DYING) { static /*@observer@*/ const char noProvidesString[] = "nada"; static /*@observer@*/ const char * rcProvidesString = noProvidesString; int_32 Flags = rpmdsFlags(dep); @@ -558,7 +558,7 @@ retry: } mi = rpmdbFreeIterator(mi); -#if defined(DYING) || defined(__LCLINT__) +#if defined(DYING) mi = rpmtsInitIterator(ts, RPMTAG_NAME, Name, 0); (void) rpmdbPruneIterator(mi, ts->removedPackages, ts->numRemovedPackages, 1); @@ -1746,7 +1746,7 @@ int rpmtsCheck(rpmts ts) rpmteNEVR(p), rpmteA(p), rpmteO(p), rpmteColor(p)); /*@=nullpass@*/ -#if defined(DYING) || defined(__LCLINT__) +#if defined(DYING) /* XXX all packages now have Provides: name = version-release */ /* Erasing: check name against requiredby matches. */ rc = checkDependentPackages(ts, rpmteN(p)); diff --git a/lib/poptALL.c b/lib/poptALL.c index 68cdd5bba..14b24619c 100644 --- a/lib/poptALL.c +++ b/lib/poptALL.c @@ -404,7 +404,7 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable) } /*@=globs =mods@*/ -#if defined(ENABLE_NLS) && !defined(__LCLINT__) +#if defined(ENABLE_NLS) (void) setlocale(LC_ALL, "" ); (void) bindtextdomain(PACKAGE, LOCALEDIR); (void) textdomain(PACKAGE); diff --git a/lib/rpmrc.c b/lib/rpmrc.c index f26734215..32b6e3204 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.c @@ -895,9 +895,6 @@ exit: static inline void cpuid(unsigned int op, int *eax, int *ebx, int *ecx, int *edx) /*@modifies *eax, *ebx, *ecx, *edx @*/ { -#ifdef __LCLINT__ - *eax = *ebx = *ecx = *edx = 0; -#endif asm volatile ( "pushl %%ebx \n" "cpuid \n" diff --git a/lib/rpmts.c b/lib/rpmts.c index a5786dde1..a456c9840 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -25,16 +25,8 @@ /* portability fiddles */ #if STATFS_IN_SYS_STATVFS /*@-incondefs@*/ -#if defined(__LCLINT__) -/*@-declundef -exportheader -protoparammatch @*/ /* LCL: missing annotation */ -extern int statvfs (const char * file, /*@out@*/ struct statvfs * buf) - /*@globals fileSystem @*/ - /*@modifies *buf, fileSystem @*/; -/*@=declundef =exportheader =protoparammatch @*/ -/*@=incondefs@*/ -#else -# include <sys/statvfs.h> -#endif +#include <sys/statvfs.h> + #else # if STATFS_IN_SYS_VFS # include <sys/vfs.h> |