folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- lclint-3.0.0.15 fiddles. 

CVS patchset: 5067
CVS date: 2001/09/21 15:07:11
This commit is contained in:
jbj 2001-09-21 15:07:11 +00:00
parent 59a045374d
commit 1eef0782f6
103 changed files with 7039 additions and 6914 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.lclintrc
View File

@ -14,6 +14,34 @@
+checks # lclint level
# --- lclint-3.0.0.15 is pickier than lclint-2.5r
#-formatconst
#-compdef
#-nullstate
-usedef # 296 occurences wtfo?
#-unsignedcompare
#-compmempass
#-multithreaded
#-nullderef # 6 occurences in getdate.y
#-nullpass
#-unrecog
#-portability
#-readonlytrans # 128 occurences in getdate.y
#-noparams
-usereleased # 3 occurences wtfo?
#-firstcase
#-shadow
#-bufferoverflowhigh
#-superuser
#-retvalint
#-incondefs
#-nullptrarith
#-fcnuse
-fielduse # noisy in 3.0.0.15
#-varuse
#-exportlocal
#-exportheadervar
# --- not-yet at strict level
#+ptrarith
#+bitwisesigned
@ -47,8 +75,8 @@
#+loopswitchbreak # 286 occurences
#+switchswitchbreak # 32 occurences
#+looploopcontinue # 86 occurences
#+whileblock
+forempty
#+whileblock
#+forblock
#+ifblock
#+noeffectuncon # 228 occurences

1
CHANGES
View File

@ -234,6 +234,7 @@
- fix: ftp remote globs broken (#46892).
- popt: clarify X consortium license in popt.3 man page.
- close/discard Depends index after rpmdepCheck() use.
- lclint-3.0.0.15 fiddles.
4.0 -> 4.0.[12]
- fix: avoid calling getpass twice as side effect of xstrdup macro

3
build/expression.c
View File

@ -261,6 +261,7 @@ static int rdToken(ParseState state)
if (xisdigit(*p)) {
char temp[EXPRBUFSIZ], *t = temp;
temp[0] = '\0';
while (*p && xisdigit(*p))
*t++ = *p++;
*t++ = '\0';
@ -272,6 +273,7 @@ static int rdToken(ParseState state)
} else if (xisalpha(*p)) {
char temp[EXPRBUFSIZ], *t = temp;
temp[0] = '\0';
while (*p && (xisalnum(*p) || *p == '_'))
*t++ = *p++;
*t++ = '\0';
@ -283,6 +285,7 @@ static int rdToken(ParseState state)
} else if (*p == '\"') {
char temp[EXPRBUFSIZ], *t = temp;
temp[0] = '\0';
p++;
while (*p && *p != '\"')
*t++ = *p++;

3
build/files.c
View File

@ -444,10 +444,12 @@ static int parseForDev(char * buf, FileList fl)
{} ;
if (*pe == '\0') {
fl->devmajor = atoi(p);
/*@-unsignedcompare @*/ /* LCL: ge is ok */
if (!(fl->devmajor >= 0 && fl->devmajor < 256)) {
errstr = "devmajor";
goto exit;
}
/*@=unsignedcompare @*/
pe++;
} else {
errstr = "devmajor";
@ -1027,6 +1029,7 @@ static void checkHardLinks(FileList fl)
FileListRec ilp, jlp;
int i, j;
nlangs[0] = '\0';
for (i = 0; i < fl->fileListRecsUsed; i++) {
char *te;

19
build/names.c
View File

@ -9,15 +9,16 @@
#include "rpmbuild.h"
#include "debug.h"
typedef /*@owned@*/ /*@null@*/ const char * ugstr_t;
static uid_t uids[1024];
/*@owned@*/ /*@null@*/ static const char *unames[1024];
static ugstr_t unames[1024];
static int uid_used = 0;
static gid_t gids[1024];
/*@owned@*/ /*@null@*/ static const char *gnames[1024];
static ugstr_t gnames[1024];
static int gid_used = 0;
/*@-nullderef@*/ /* FIX: shrug */
void freeNames(void)
{
int x;
@ -33,6 +34,7 @@ const char *getUname(uid_t uid)
int x;
for (x = 0; x < uid_used; x++) {
if (unames[x] == NULL) continue;
if (uids[x] == uid)
return unames[x];
}
@ -54,6 +56,7 @@ const char *getUnameS(const char *uname)
int x;
for (x = 0; x < uid_used; x++) {
if (unames[x] == NULL) continue;
if (!strcmp(unames[x],uname))
return unames[x];
}
@ -75,6 +78,7 @@ uid_t getUidS(const char *uname)
int x;
for (x = 0; x < uid_used; x++) {
if (unames[x] == NULL) continue;
if (!strcmp(unames[x],uname))
return uids[x];
}
@ -96,6 +100,7 @@ const char *getGname(gid_t gid)
int x;
for (x = 0; x < gid_used; x++) {
if (gnames[x] == NULL) continue;
if (gids[x] == gid)
return gnames[x];
}
@ -117,6 +122,7 @@ const char *getGnameS(const char *gname)
int x;
for (x = 0; x < gid_used; x++) {
if (gnames[x] == NULL) continue;
if (!strcmp(gnames[x], gname))
return gnames[x];
}
@ -138,6 +144,7 @@ gid_t getGidS(const char *gname)
int x;
for (x = 0; x < gid_used; x++) {
if (gnames[x] == NULL) continue;
if (!strcmp(gnames[x], gname))
return gids[x];
}
@ -152,7 +159,6 @@ gid_t getGidS(const char *gname)
gnames[x] = (gr ? xstrdup(gr->gr_name) : xstrdup(gname));
return gids[x];
}
/*@=nullderef@*/
int_32 *const getBuildTime(void)
{
@ -171,7 +177,10 @@ const char *const buildHost(void)
if (! gotit) {
(void) gethostname(hostname, sizeof(hostname));
if ((hbn = /*@-unrecog@*/ gethostbyname(hostname) /*@=unrecog@*/ ))
/*@-unrecog -multithreaded @*/
hbn = gethostbyname(hostname);
/*@=unrecog =multithreaded @*/
if (hbn)
strcpy(hostname, hbn->h_name);
else
rpmMessage(RPMMESS_WARNING,

2
build/parsePreamble.c
View File

@ -753,7 +753,7 @@ static inline void initPreambleList(void)
/**
*/
static int findPreambleTag(Spec spec, /*@out@*/int * tag,
/*@null@*/ /*@out@*/ const char ** macro, char * lang)
/*@null@*/ /*@out@*/ const char ** macro, /*@out@*/ char * lang)
/*@modifies *tag, *macro, *lang @*/
{
PreambleRec p;

1
build/parseScript.c
View File

@ -92,6 +92,7 @@ int parseScript(Spec spec, int parsePart)
const char **argv = NULL;
poptContext optCon = NULL;
reqargs[0] = '\0';
name = NULL;
prog = "/bin/sh";
file = NULL;

4
lib/Makefile.am
View File

@ -64,14 +64,14 @@ getdate.c: getdate.y
-@if test -f y.tab.c; then \
{ echo "/*@-globstate -statictrans -unqualifiedtrans -noparams @*/";\
echo "/*@-retvalint -usedef -varuse -nullderef -nullassign @*/";\
echo "/*@-readonlytrans -modunconnomods @*/";\
echo "/*@-readonlytrans -modunconnomods -compdef @*/";\
sed -e 's,y.tab.c,getdate.c,' y.tab.c \
-e 's,^YYSTYPE ,static &,' \
-e 's,^short ,static &,' \
-e 's,^const short ,static &,' \
-e 's,^int yydebug,/*@unused@*/ static &,' \
-e 's,^int ,static &,' ;\
echo "/*@=readonlytrans =modunconnomods @*/";\
echo "/*@=readonlytrans =modunconnomods =compdef @*/";\
echo "/*@=retvalint =usedef =varuse =nullderef =nullassign @*/";\
echo "/*@=globstate =statictrans =unqualifiedtrans =noparams @*/";\
} > getdate.c ;\

11
lib/depends.c
View File

@ -3,7 +3,7 @@
*/
/*@-exportheadervar@*/
/*@unused@*/ int _depends_debug = 0;
/*@unused@*/ static int _depends_debug = 0;
/*@=exportheadervar@*/
#include "system.h"
@ -377,6 +377,7 @@ alAddPackage(availableList al,
dirMatch->files = xrealloc(dirMatch->files,
sizeof(*dirMatch->files) *
(dirMatch->numFiles + last - first + 1));
if (p->baseNames != NULL) /* XXX can't happen */
for (fileNum = first; fileNum <= last; fileNum++) {
dirMatch->files[dirMatch->numFiles].baseName =
p->baseNames[fileNum];
@ -2152,8 +2153,8 @@ rescan:
* @param rpmtag rpm tag
* @return 0 on success
*/
static int rpmdbCloseDBI(rpmdb db, int rpmtag)
/*@ modifies fileSystem @*/
static int rpmdbCloseDBI(/*@null@*/ rpmdb db, int rpmtag)
/*@ modifies db, fileSystem @*/
{
int dbix;
int rc = 0;
@ -2211,7 +2212,7 @@ int rpmdepCheck(rpmTransactionSet ts,
for (i = 0; i < npkgs; i++, p++)
{
rpmMessage(RPMMESS_DEBUG, ("========== +++ %s-%s-%s\n"),
rpmMessage(RPMMESS_DEBUG, "========== +++ %s-%s-%s\n" ,
p->name, p->version, p->release);
rc = checkPackageDeps(ts, ps, p->h, NULL, p->multiLib);
if (rc)
@ -2248,7 +2249,7 @@ int rpmdepCheck(rpmTransactionSet ts,
{ const char * name, * version, * release;
(void) headerNVR(h, &name, &version, &release);
rpmMessage(RPMMESS_DEBUG, ("========== --- %s-%s-%s\n"),
rpmMessage(RPMMESS_DEBUG, "========== --- %s-%s-%s\n" ,
name, version, release);
/* Erasing: check name against requiredby matches. */

8
lib/formats.c
View File

@ -56,7 +56,9 @@ static /*@only@*/ char * permsFormat(int_32 type, const void * data, char * form
val = xmalloc(15 + padding);
strcat(formatPrefix, "s");
buf = rpmPermsString(*((int_32 *) data));
/*@-formatconst@*/
sprintf(val, formatPrefix, buf);
/*@=formatconst@*/
buf = _free(buf);
}
@ -98,7 +100,9 @@ static /*@only@*/ char * fflagsFormat(int_32 type, const void * data,
val = xmalloc(5 + padding);
strcat(formatPrefix, "s");
/*@-formatconst@*/
sprintf(val, formatPrefix, buf);
/*@=formatconst@*/
}
return val;
@ -134,7 +138,9 @@ static /*@only@*/ char * depflagsFormat(int_32 type, const void * data,
val = xmalloc(5 + padding);
strcat(formatPrefix, "s");
/*@-formatconst@*/
sprintf(val, formatPrefix, buf);
/*@=formatconst@*/
}
return val;
@ -480,7 +486,7 @@ static int i18nTag(Header h, int_32 tag, /*@out@*/ rpmTagType * type,
rc = hge(h, tag, type, (void **)data, count);
if (rc) {
if (rc && (*data) != NULL) {
*data = xstrdup(*data);
*freeData = 1;
return 0;

6
lib/fsm.c
View File

@ -1576,7 +1576,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
}
} else if (S_ISCHR(st->st_mode) ||
S_ISBLK(st->st_mode) ||
S_ISSOCK(st->st_mode))
/*@-unrecog@*/ S_ISSOCK(st->st_mode) /*@=unrecog@*/)
{
rc = fsmStage(fsm, FSM_VERIFY);
if (rc == CPIOERR_LSTAT_FAILED)
@ -1921,9 +1921,9 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
if (rc < 0) rc = CPIOERR_MKFIFO_FAILED;
break;
case FSM_MKNOD:
/*@-unrecog@*/
/*@-unrecog -portability @*/ /* FIX: check S_IFIFO or dev != 0 */
rc = mknod(fsm->path, (st->st_mode & ~07777), st->st_rdev);
/*@=unrecog@*/
/*@=unrecog =portability @*/
if (_fsm_debug && (stage & FSM_SYSCALL))
rpmMessage(RPMMESS_DEBUG, " %8s (%s, 0%o, 0x%x) %s\n", cur,
fsm->path, (unsigned)(st->st_mode & ~07777),

56
lib/getdate.c
View File

@ -1,4 +1,6 @@
/*@-globstate -retvalint -unqualifiedtrans -usedef -varuse@*/
/*@-globstate -statictrans -unqualifiedtrans -noparams @*/
/*@-retvalint -usedef -varuse -nullderef -nullassign @*/
/*@-readonlytrans -modunconnomods -compdef @*/
#ifndef lint
static char const
yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28 2000/01/17 02:04:06 bde Exp $";
@ -200,7 +202,7 @@ typedef union {
time_t Number;
enum _MERIDIAN Meridian;
} YYSTYPE;
#line 203 "y.tab.c"
#line 203 "getdate.c"
#define YYERRCODE 256
#define tAGO 257
#define tDAY 258
@ -215,49 +217,49 @@ typedef union {
#define tUNUMBER 267
#define tZONE 268
#define tDST 269
const short yylhs[] = { -1,
static const short yylhs[] = { -1,
0, 0, 2, 2, 2, 2, 2, 2, 3, 3,
3, 3, 3, 4, 4, 4, 6, 6, 6, 5,
5, 5, 5, 5, 5, 5, 5, 7, 7, 9,
9, 9, 9, 9, 9, 9, 9, 9, 8, 1,
1,
};
const short yylen[] = { 2,
static const short yylen[] = { 2,
0, 2, 1, 1, 1, 1, 1, 1, 2, 4,
4, 6, 6, 1, 1, 2, 1, 2, 2, 3,
5, 3, 3, 2, 4, 2, 3, 2, 1, 2,
2, 1, 2, 2, 1, 2, 2, 1, 1, 0,
1,
};
const short yydefred[] = { 1,
static const short yydefred[] = { 1,
0, 0, 15, 32, 0, 38, 35, 0, 0, 0,
2, 3, 4, 5, 6, 7, 8, 0, 18, 0,
31, 36, 33, 19, 9, 30, 0, 37, 34, 0,
0, 0, 16, 28, 0, 23, 27, 22, 0, 0,
25, 41, 11, 0, 10, 0, 0, 21, 13, 12,
};
const short yydgoto[] = { 1,
static const short yydgoto[] = { 1,
45, 11, 12, 13, 14, 15, 16, 17, 18,
};
const short yysindex[] = { 0,
static const short yysindex[] = { 0,
-249, -38, 0, 0, -260, 0, 0, -240, -47, -248,
0, 0, 0, 0, 0, 0, 0, -237, 0, -18,
0, 0, 0, 0, 0, 0, -262, 0, 0, -239,
-238, -236, 0, 0, -235, 0, 0, 0, -56, -19,
0, 0, 0, -234, 0, -232, -258, 0, 0, 0,
};
const short yyrindex[] = { 0,
static const short yyrindex[] = { 0,
0, 1, 0, 0, 0, 0, 0, 0, 69, 12,
0, 0, 0, 0, 0, 0, 0, 23, 0, 34,
0, 0, 0, 0, 0, 0, 67, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 56, 45,
0, 0, 0, 0, 0, 0, 56, 0, 0, 0,
};
const short yygindex[] = { 0,
static const short yygindex[] = { 0,
-17, 0, 0, 0, 0, 0, 0, 0, 0,
};
#define YYTABLESIZE 337
const short yytable[] = { 32,
static const short yytable[] = { 32,
17, 44, 42, 36, 37, 19, 20, 49, 2, 3,
31, 14, 4, 5, 6, 7, 8, 9, 10, 34,
33, 21, 29, 22, 23, 35, 38, 46, 39, 50,
@ -293,7 +295,7 @@ const short yytable[] = { 32,
40, 0, 40, 40, 26, 26, 0, 39, 26, 26,
26, 26, 0, 0, 26, 39, 39,
};
const short yycheck[] = { 47,
static const short yycheck[] = { 47,
0, 58, 261, 266, 267, 44, 267, 266, 258, 259,
58, 0, 262, 263, 264, 265, 266, 267, 268, 257,
269, 262, 0, 264, 265, 44, 266, 47, 267, 47,
@ -406,18 +408,18 @@ const char * const yyrule[] = {
#endif
#endif
#define YYINITSTACKSIZE 200
int yydebug;
int yynerrs;
int yyerrflag;
int yychar;
short *yyssp;
YYSTYPE *yyvsp;
YYSTYPE yyval;
YYSTYPE yylval;
short *yyss;
short *yysslim;
YYSTYPE *yyvs;
int yystacksize;
/*@unused@*/ static int yydebug;
static int yynerrs;
static int yyerrflag;
static int yychar;
static short *yyssp;
static YYSTYPE *yyvsp;
static YYSTYPE yyval;
static YYSTYPE yylval;
static short *yyss;
static short *yysslim;
static YYSTYPE *yyvs;
static int yystacksize;
#line 403 "./getdate.y"
/* Month and day table. */
@ -1047,7 +1049,7 @@ main(ac, av)
/* NOTREACHED */
}
#endif /* defined(TEST) */
#line 1050 "y.tab.c"
#line 1050 "getdate.c"
/* allocate initial stack or double stack size, up to YYMAXDEPTH */
static int yygrowstack()
{
@ -1532,7 +1534,7 @@ case 41:
yyval.Meridian = yyvsp[0].Meridian;
}
break;
#line 1535 "y.tab.c"
#line 1535 "getdate.c"
}
yyssp -= yym;
yystate = *yyssp;
@ -1589,4 +1591,6 @@ yyabort:
yyaccept:
return (0);
}
/*@=globstate =retvalint =unqualifiedtrans =usedef =varuse@*/
/*@=readonlytrans =modunconnomods =compdef @*/
/*@=retvalint =usedef =varuse =nullderef =nullassign @*/
/*@=globstate =statictrans =unqualifiedtrans =noparams @*/

17
lib/header.c
View File

@ -2265,6 +2265,7 @@ static char * formatValue(sprintfTag tag, Header h,
headerTagFormatFunction tagtype = NULL;
headerSprintfExtension ext;
memset(buf, 0, sizeof(buf));
if (tag->ext) {
if (getExtension(h, tag->ext, &type, &data, &count,
extCache + tag->extNum))
@ -2325,7 +2326,9 @@ static char * formatValue(sprintfTag tag, Header h,
len = strlen(strarray[element]) + tag->pad + 20;
val = xmalloc(len);
/*@-formatconst@*/
sprintf(val, buf, strarray[element]);
/*@=formatconst@*/
}
/*@-observertrans -modobserver@*/
@ -2343,7 +2346,9 @@ static char * formatValue(sprintfTag tag, Header h,
len = strlen(data) + tag->pad + 20;
val = xmalloc(len);
/*@-formatconst@*/
sprintf(val, buf, data);
/*@=formatconst@*/
}
break;
@ -2366,7 +2371,9 @@ static char * formatValue(sprintfTag tag, Header h,
strcat(buf, "d");
len = 10 + tag->pad + 20;
val = xmalloc(len);
/*@-formatconst@*/
sprintf(val, buf, intVal);
/*@=formatconst@*/
}
break;
@ -2615,7 +2622,9 @@ static char * octalFormat(int_32 type, hPTR_t data,
} else {
val = xmalloc(20 + padding);
strcat(formatPrefix, "o");
/*@-formatconst@*/
sprintf(val, formatPrefix, *((int_32 *) data));
/*@=formatconst@*/
}
return val;
@ -2634,7 +2643,9 @@ static char * hexFormat(int_32 type, hPTR_t data,
} else {
val = xmalloc(20 + padding);
strcat(formatPrefix, "x");
/*@-formatconst@*/
sprintf(val, formatPrefix, *((int_32 *) data));
/*@=formatconst@*/
}
return val;
@ -2665,7 +2676,9 @@ static char * realDateFormat(int_32 type, hPTR_t data,
buf[0] = '\0';
if (tstruct)
(void) strftime(buf, sizeof(buf) - 1, strftimeFormat, tstruct);
/*@-formatconst@*/
sprintf(val, formatPrefix, buf);
/*@=formatconst@*/
}
return val;
@ -2701,11 +2714,15 @@ static char * shescapeFormat(int_32 type, hPTR_t data,
if (type == RPM_INT32_TYPE) {
result = xmalloc(padding + 20);
strcat(formatPrefix, "d");
/*@-formatconst@*/
sprintf(result, formatPrefix, *((int_32 *) data));
/*@=formatconst@*/
} else {
buf = alloca(strlen(data) + padding + 2);
strcat(formatPrefix, "s");
/*@-formatconst@*/
sprintf(buf, formatPrefix, data);
/*@=formatconst@*/
result = dst = xmalloc(strlen(buf) * 4 + 3);
*dst++ = '\'';

8
lib/md5.h
View File

@ -78,7 +78,7 @@ void rpmMD5Transform(uint32 buf[4], uint32 const in[16])
* @retval digest MD5 digest
* @return 0 on success, 1 on error
*/
int mdfile(const char * fn, unsigned char * digest)
int mdfile(const char * fn, /*@out@*/ unsigned char * digest)
/*@modifies digest @*/;
/**
@ -87,7 +87,7 @@ int mdfile(const char * fn, unsigned char * digest)
* @retval bindigest MD5 digest
* @return 0 on success, 1 on error
*/
int mdbinfile(const char * fn, unsigned char * bindigest)
int mdbinfile(const char * fn, /*@out@*/ unsigned char * bindigest)
/*@modifies *bindigest @*/;
/* These assume a little endian machine and return incorrect results!
@ -100,7 +100,7 @@ int mdbinfile(const char * fn, unsigned char * bindigest)
* @retval digest MD5 digest
* @return 0 on success, 1 on error
*/
int mdfileBroken(const char * fn, unsigned char * digest)
int mdfileBroken(const char * fn, /*@out@*/ unsigned char * digest)
/*@modifies *digest @*/;
/**
@ -110,7 +110,7 @@ int mdfileBroken(const char * fn, unsigned char * digest)
* @retval bindigest MD5 digest
* @return 0 on success, 1 on error
*/
int mdbinfileBroken(const char * fn, unsigned char * bindigest)
int mdbinfileBroken(const char * fn, /*@out@*/ unsigned char * bindigest)
/*@modifies *bindigest @*/;
#ifdef __cplusplus

5
lib/md5sum.c
View File

@ -24,8 +24,9 @@
* @param brokenEndian calculate broken MD5 sum?
* @return 0 on success, 1 on error
*/
static int domd5(const char * fn, unsigned char * digest, int asAscii,
static int domd5(const char * fn, /*@out@*/ unsigned char * digest, int asAscii,
int brokenEndian)
/*@modifies digest, fileSystem @*/
{
int rc;
@ -107,6 +108,7 @@ static int domd5(const char * fn, unsigned char * digest, int asAscii,
return rc;
}
/*@-mods@*/ /* FIX: shrug */
int mdbinfile(const char *fn, unsigned char *bindigest) {
return domd5(fn, bindigest, 0, 0);
}
@ -122,3 +124,4 @@ int mdfile(const char *fn, unsigned char *digest) {
int mdfileBroken(const char *fn, unsigned char *digest) {
return domd5(fn, digest, 1, 1);
}
/*@=mods@*/

4
lib/misc.c
View File

@ -222,9 +222,9 @@ int makeTempFile(const char * prefix, const char ** fnptr, FD_t * fdptr)
goto errxit;
switch(temput) {
struct stat sb, sb2;
case URL_IS_PATH:
case URL_IS_UNKNOWN:
{ struct stat sb, sb2;
if (!stat(tfn, &sb) && S_ISLNK(sb.st_mode)) {
rpmError(RPMERR_SCRIPT, _("error creating temporary file %s\n"), tfn);
goto errxit;
@ -241,7 +241,7 @@ int makeTempFile(const char * prefix, const char ** fnptr, FD_t * fdptr)
goto errxit;
}
}
break;
} break;
default:
break;
}

2
lib/problems.c
View File

@ -89,11 +89,13 @@ void printDepProblems(FILE * fp,
}
#if !defined(HAVE_VSNPRINTF) || defined(__LCLINT__)
/*@-shadow -bufferoverflowhigh @*/
static inline int vsnprintf(char * buf, /*@unused@*/ int nb,
const char * fmt, va_list ap)
{
return vsprintf(buf, fmt, ap);
}
/*@=shadow =bufferoverflowhigh @*/
#endif
#if !defined(HAVE_SNPRINTF) || defined(__LCLINT__)
static inline int snprintf(char * buf, int nb, const char * fmt, ...)

12
lib/psm.c
View File

@ -983,7 +983,9 @@ static int runScript(PSM_t psm, Header h,
/*@fallthrough@*/
case URL_IS_UNKNOWN:
if (!ts->chrootDone && !(rootDir[0] == '/' && rootDir[1] == '\0')) {
/*@-unrecog@*/ chroot(rootDir); /*@=unrecog@*/
/*@-unrecog -superuser @*/
(void) chroot(rootDir);
/*@=unrecog =superuser @*/
}
(void) chdir("/");
(void) execv(argv[0], (char *const *)argv);
@ -1857,9 +1859,9 @@ assert(psm->mi == NULL);
}
(void) chdir("/");
/*@-unrecog@*/
/*@-unrecog -superuser @*/
rc = chroot(ts->rootDir);
/*@=unrecog@*/
/*@=unrecog =superuser @*/
psm->chrootDone = ts->chrootDone = 1;
if (ts->rpmdb != NULL) ts->rpmdb->db_chrootDone = 1;
/*@-onlytrans@*/
@ -1870,9 +1872,9 @@ assert(psm->mi == NULL);
case PSM_CHROOT_OUT:
/* Restore root directory if changed. */
if (psm->chrootDone) {
/*@-unrecog@*/
/*@-unrecog -superuser @*/
rc = chroot(".");
/*@=unrecog@*/
/*@=unrecog =superuser @*/
psm->chrootDone = ts->chrootDone = 0;
if (ts->rpmdb != NULL) ts->rpmdb->db_chrootDone = 0;
chroot_prefix = NULL;

2
lib/query.c
View File

@ -6,7 +6,9 @@
#include "system.h"
#ifndef PATH_MAX
/*@-incondefs@*/ /* FIX: long int? */
# define PATH_MAX 255
/*@=incondefs@*/
#endif
#include <rpmcli.h>

2
lib/rpmchecksig.c
View File

@ -82,7 +82,7 @@ static int copyFile(FD_t *sfdp, const char **sfnp,
goto exit;
while ((count = Fread(buffer, sizeof(buffer[0]), sizeof(buffer), *sfdp)) > 0) {
if (Fwrite(buffer, sizeof(buffer[0]), count, *tfdp) < 0) {
if (Fwrite(buffer, sizeof(buffer[0]), count, *tfdp) != count) {
rpmError(RPMERR_FWRITE, _("%s: Fwrite failed: %s\n"), *tfnp,
Fstrerror(*tfdp));
goto exit;

8
lib/rpminstall.c
View File

@ -169,9 +169,9 @@ struct rpmEIU {
FD_t fd;
int numFailed;
int numPkgs;
/*@only@*/ /*@null@*/ str_t * pkgURL;
/*@only@*/ str_t * pkgURL;
/*@dependent@*/ /*@null@*/ str_t * fnp;
/*@only@*/ /*@null@*/ char * pkgState;
/*@only@*/ char * pkgState;
int prevx;
int pkgx;
int numRPMS;
@ -766,8 +766,8 @@ IDTX IDTXload(rpmdb db, rpmTag tag)
mi = rpmdbInitIterator(db, tag, NULL, 0);
while ((h = rpmdbNextIterator(mi)) != NULL) {
rpmTagType type;
int_32 count;
rpmTagType type = RPM_NULL_TYPE;
int_32 count = 0;
int_32 * tidp;
tidp = NULL;

3
lib/rpmlib.h
View File

@ -1717,7 +1717,8 @@ typedef enum rpmVerifySignatureReturn_e {
* @return result of signature verification
*/
rpmVerifySignatureReturn rpmVerifySignature(const char *file,
int_32 sigTag, const void * sig, int count, char * result)
int_32 sigTag, const void * sig, int count,
/*@out@*/ char * result)
/*@modifies *result, fileSystem @*/;
/** \ingroup signature

2
lib/rpmrc.c
View File

@ -1603,7 +1603,9 @@ void rpmFreeRpmrc(void)
current[OS] = _free(current[OS]);
current[ARCH] = _free(current[ARCH]);
defaultsInitialized = 0;
/*@-nullstate@*/ /* FIX: current may be NULL */
return;
/*@=nullstate@*/
}
int rpmShowRC(FILE * fp)

10
lib/signature.c
View File

@ -153,6 +153,7 @@ rpmRC rpmReadSignature(FD_t fd, Header * headerp, sigType sig_type)
if (headerp)
*headerp = NULL;
buf[0] = 0;
switch (sig_type) {
case RPMSIGTYPE_NONE:
rpmMessage(RPMMESS_DEBUG, _("No signature\n"));
@ -456,7 +457,7 @@ int rpmAddSignature(Header h, const char * file, int_32 sigTag,
}
static rpmVerifySignatureReturn
verifySizeSignature(const char * datafile, int_32 size, char * result)
verifySizeSignature(const char * datafile, int_32 size, /*@out@*/ char * result)
/*@modifies *result, fileSystem @*/
{
struct stat st;
@ -477,11 +478,12 @@ verifySizeSignature(const char * datafile, int_32 size, char * result)
static rpmVerifySignatureReturn
verifyMD5Signature(const char * datafile, const byte * sig,
char * result, md5func fn)
/*@out@*/ char * result, md5func fn)
/*@modifies *result, fileSystem @*/
{
byte md5sum[16];
memset(md5sum, 0, sizeof(md5sum));
(void) fn(datafile, md5sum);
if (memcmp(md5sum, sig, 16)) {
sprintf(result, "MD5 sum mismatch\n"
@ -512,7 +514,7 @@ verifyMD5Signature(const char * datafile, const byte * sig,
static rpmVerifySignatureReturn
verifyPGPSignature(const char * datafile, const void * sig, int count,
char * result)
/*@out@*/ char * result)
/*@modifies *result, fileSystem @*/
{
int pid, status, outpipe[2];
@ -641,7 +643,7 @@ verifyPGPSignature(const char * datafile, const void * sig, int count,
static rpmVerifySignatureReturn
verifyGPGSignature(const char * datafile, const void * sig, int count,
char * result)
/*@out@*/ char * result)
/*@modifies *result, fileSystem @*/
{
int pid, status, outpipe[2];

15
lib/transaction.c
View File

@ -403,6 +403,7 @@ static Header relocateFileList(const rpmTransactionSet ts, TFI_t fi,
? t
: stripTrailingChar(t, '/');
/*@-nullpass@*/ /* FIX: relocations[i].oldPath == NULL */
/* Verify that the relocation's old path is in the header. */
for (j = 0; j < numValid; j++)
if (!strcmp(validRelocations[j], relocations[i].oldPath))
@ -413,6 +414,8 @@ static Header relocateFileList(const rpmTransactionSet ts, TFI_t fi,
relocations[i].oldPath, NULL, NULL, 0);
del =
strlen(relocations[i].newPath) - strlen(relocations[i].oldPath);
/*@=nullpass@*/
if (del > reldel)
reldel = del;
} else {
@ -1123,8 +1126,8 @@ static void handleOverlappedFiles(TFI_t fi, hashTable ht,
}
switch (fi->type) {
struct stat sb;
case TR_ADDED:
{ struct stat sb;
if (otherPkgNum < 0) {
/* XXX is this test still necessary? */
if (fi->actions[i] != FA_UNKNOWN)
@ -1161,7 +1164,7 @@ static void handleOverlappedFiles(TFI_t fi, hashTable ht,
} else {
fi->actions[i] = FA_CREATE;
}
break;
} break;
case TR_REMOVED:
if (otherPkgNum >= 0) {
/* Here is an overlapped added file we don't want to nuke. */
@ -1769,7 +1772,9 @@ int rpmRunTransactions( rpmTransactionSet ts,
if (!ts->chrootDone) {
(void) chdir("/");
/*@-unrecog@*/ chroot(ts->rootDir); /*@=unrecog@*/
/*@-unrecog -superuser @*/
(void) chroot(ts->rootDir);
/*@=unrecog =superuser @*/
ts->chrootDone = 1;
if (ts->rpmdb) ts->rpmdb->db_chrootDone = 1;
/*@-onlytrans@*/
@ -1935,7 +1940,9 @@ int rpmRunTransactions( rpmTransactionSet ts,
tsi = tsFreeIterator(tsi);
if (ts->chrootDone) {
/*@-unrecog@*/ chroot("."); /*@-unrecog@*/
/*@-unrecog -superuser @*/
(void) chroot(".");
/*@=unrecog =superuser @*/
ts->chrootDone = 0;
if (ts->rpmdb) ts->rpmdb->db_chrootDone = 0;
chroot_prefix = NULL;

428
po/cs.po
View File

File diff suppressed because it is too large Load Diff

428
po/da.po
View File

File diff suppressed because it is too large Load Diff

428
po/de.po
View File

File diff suppressed because it is too large Load Diff

440
po/en_RN.po
View File

File diff suppressed because it is too large Load Diff

440
po/es.po
View File

File diff suppressed because it is too large Load Diff

440
po/eu_ES.po
View File

File diff suppressed because it is too large Load Diff

428
po/fi.po
View File

File diff suppressed because it is too large Load Diff

428
po/fr.po
View File

File diff suppressed because it is too large Load Diff

440
po/gl.po
View File

File diff suppressed because it is too large Load Diff

440
po/hu.po
View File

File diff suppressed because it is too large Load Diff

440
po/id.po
View File

File diff suppressed because it is too large Load Diff

440
po/is.po
View File

File diff suppressed because it is too large Load Diff

440
po/it.po
View File

File diff suppressed because it is too large Load Diff

430
po/ja.po
View File

File diff suppressed because it is too large Load Diff

428
po/ko.po
View File

File diff suppressed because it is too large Load Diff

440
po/no.po
View File

File diff suppressed because it is too large Load Diff

428
po/pl.po
View File

File diff suppressed because it is too large Load Diff

428
po/pt.po
View File

File diff suppressed because it is too large Load Diff

428
po/pt_BR.po
View File

File diff suppressed because it is too large Load Diff

440
po/ro.po
View File

File diff suppressed because it is too large Load Diff

440
po/rpm.pot
View File

File diff suppressed because it is too large Load Diff

428
po/ru.po
View File

File diff suppressed because it is too large Load Diff

428
po/sk.po
View File

File diff suppressed because it is too large Load Diff

430
po/sl.po
View File

File diff suppressed because it is too large Load Diff

428
po/sr.po
View File

File diff suppressed because it is too large Load Diff

428
po/sv.po
View File

File diff suppressed because it is too large Load Diff

428
po/tr.po
View File

File diff suppressed because it is too large Load Diff

440
po/uk.po
View File

File diff suppressed because it is too large Load Diff

440
po/wa.po
View File

File diff suppressed because it is too large Load Diff

440
po/zh.po
View File

File diff suppressed because it is too large Load Diff

440
po/zh_CN.GB2312.po
View File

File diff suppressed because it is too large Load Diff

6
popt/po/cs.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 2001-07-24 00:03+0100\n"
"Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@ -102,10 +102,10 @@ msgstr "DOUBLE"
msgid "ARG"
msgstr "ARG"
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr "Pou¾ití:"
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr "[VOLBY...]"

6
popt/po/da.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
"Last-Translator: Martin Hansen <mah@k64.dk>\n"
"Language-Team: Dansk <dansk@klid.dk>\n"
@ -104,10 +104,10 @@ msgstr "DOUBLE"
msgid "ARG"
msgstr "ARG"
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr "Brug:"
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr "[TILVALG...]"

6
popt/po/de.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -107,10 +107,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/es.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -108,10 +108,10 @@ msgstr "DOUBLE"
msgid "ARG"
msgstr "ARG"
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr "Modo de Uso:"
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr "[OPCIÓN...]"

6
popt/po/eu_ES.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -107,10 +107,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/fi.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -107,10 +107,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/fr.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -107,10 +107,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/gl.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 2001-01-17 01:01+0100\n"
"Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@ -103,10 +103,10 @@ msgstr "DOUBLE"
msgid "ARG"
msgstr "ARG"
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr "Uso:"
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr "[OPCIÓN...]"

6
popt/po/hu.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 2000-08-03 23:26+0200\n"
"Last-Translator: László Németh <nemeth@qwertynet.hu>\n"
"Language-Team: Hungarian\n"
@ -103,10 +103,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/id.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -107,10 +107,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/is.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 2001-06-08 01:35+0000\n"
"Last-Translator: Richard Allen <ra@hp.is>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"
@ -102,10 +102,10 @@ msgstr "DOUBLE"
msgid "ARG"
msgstr "ARG"
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr "Notkun:"
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr "[ROFI...]"

6
popt/po/it.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -107,10 +107,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/ja.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -107,10 +107,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/ko.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 2001-09-06 20:06+0900\n"
"Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
"Language-Team: GNU Translation project <ko@li.org>\n"
@ -102,10 +102,10 @@ msgstr "
msgid "ARG"
msgstr "牢荐(ARG)"
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr "荤侩过:"
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr "[可记...]"

6
popt/po/no.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 2001-06-27 11:05+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
"Language-Team: Norwegian <no@li.org>\n"
@ -102,10 +102,10 @@ msgstr "DOUBLE"
msgid "ARG"
msgstr "ARG"
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr "Bruk:"
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr "[FLAGG...]"

6
popt/po/pl.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -107,10 +107,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/popt.pot
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -107,10 +107,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/pt.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 2001-01-21 19:31+00:00\n"
"Last-Translator: Pedro Morais <morais@kde.org>\n"
"Language-Team: pt <morais@kde.org>\n"
@ -103,10 +103,10 @@ msgstr "DOUBLE"
msgid "ARG"
msgstr "ARG"
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr "Utilização:"
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr "[OPÇÃO...]"

6
popt/po/pt_BR.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -107,10 +107,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/ro.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 2000-06-14 23:23+EST\n"
"Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
"Language-Team: Romanian <ro@li.org>\n"
@ -104,10 +104,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr "Sintaxa:"
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr "[OPTIUNE...]"

6
popt/po/ru.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 2001-07-05 21:00-0500\n"
"Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@ -102,10 +102,10 @@ msgstr "DOUBLE"
msgid "ARG"
msgstr "ARG"
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ:"
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr "[ðáòáíåôò...]"

6
popt/po/sk.po
View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 1999-08-04 21:40+0200\n"
"Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@ -107,10 +107,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/sl.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 2000-09-05 12:30+0200\n"
"Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@ -103,10 +103,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/sr.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -107,10 +107,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/sv.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 2001-07-12 22:26+0100\n"
"Last-Translator: Christian Rose <menthos@menthos.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
@ -102,10 +102,10 @@ msgstr "DUBBEL"
msgid "ARG"
msgstr "ARG"
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr "Användning:"
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr "[FLAGGA...]"

6
popt/po/tr.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 2000-02-11 13:01+0200\n"
"Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
"Language-Team: Turkish <tr@li.org>\n"
@ -103,10 +103,10 @@ msgstr "DOUBLE"
msgid "ARG"
msgstr "ARG"
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr "Kullanýmý:"
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr "[SEÇENEK...]"

6
popt/po/uk.po
View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 1999-09-30 16:54+0200\n"
"Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
"Language-Team: Ukrainian <uk@li.org>\n"
@ -107,10 +107,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/wa.po
View File

@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 1999-03-18 23:11+0100\n"
"Last-Translator: Nobody yet\n"
"Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@ -111,10 +111,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/zh.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -107,10 +107,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

6
popt/po/zh_CN.GB2312.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
"POT-Creation-Date: 2001-07-16 21:53-0400\n"
"POT-Creation-Date: 2001-09-21 10:20-0400\n"
"PO-Revision-Date: 1999-11-11 05:04+0800\n"
"Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
"Language-Team: TLDN\n"
@ -103,10 +103,10 @@ msgstr ""
msgid "ARG"
msgstr ""
#: popthelp.c:434
#: popthelp.c:438
msgid "Usage:"
msgstr ""
#: popthelp.c:456
#: popthelp.c:460
msgid "[OPTION...]"
msgstr ""

4
popt/popthelp.c
View File

@ -254,7 +254,9 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
}
*le++ = '=';
if (negate) *le++ = '~';
/*@-formatconst@*/
le += sprintf(le, (ops ? "0x%lx" : "%ld"), aLong);
/*@=formatconst@*/
*le++ = ']';
} break;
case POPT_ARG_INT:
@ -301,7 +303,9 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
ch++;
sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), indentLength);
/*@-formatconst@*/
fprintf(fp, format, help, " ");
/*@=formatconst@*/
help = ch;
while (isspace(*help) && *help) help++;
helpLength = strlen(help);

8
popt/poptint.h
View File

@ -80,17 +80,17 @@ struct poptContext_s {
#if defined(HAVE_GETTEXT) && !defined(__LCLINT__)
#define _(foo) gettext(foo)
#else
#define _(foo) (foo)
#define _(foo) foo
#endif
#if defined(HAVE_DGETTEXT) && !defined(__LCLINT__)
#define D_(dom, str) dgettext(dom, str)
#define POPT_(foo) D_("popt", foo)
#else
#define D_(dom, str) (str)
#define POPT_(foo) (foo)
#define D_(dom, str) str
#define POPT_(foo) foo
#endif
#define N_(foo) (foo)
#define N_(foo) foo
#endif

5
rpm.spec
View File

@ -19,7 +19,7 @@ Name: rpm
%define version 4.0.3
Version: %{version}
%{expand: %%define rpm_version %{version}}
Release: 1.05
Release: 1.06
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
Copyright: GPL
@ -509,6 +509,9 @@ fi
%{__prefix}/include/popt.h
%changelog
* Fri Sep 21 2001 Jeff Johnson <jbj@redhat.com>
- lclint-3.0.0.15 fiddles.
* Sat Sep 15 2001 Jeff Johnson <jbj@redhat.com>
- close/discard Depends index after rpmdepCheck() use.

5
rpm.spec.in
View File

@ -19,7 +19,7 @@ Name: rpm
%define version @VERSION@
Version: %{version}
%{expand: %%define rpm_version %{version}}
Release: 1.05
Release: 1.06
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
Copyright: GPL
@ -509,6 +509,9 @@ fi
%{__prefix}/include/popt.h
%changelog
* Fri Sep 21 2001 Jeff Johnson <jbj@redhat.com>
- lclint-3.0.0.15 fiddles.
* Sat Sep 15 2001 Jeff Johnson <jbj@redhat.com>
- close/discard Depends index after rpmdepCheck() use.

5
rpmdb/dbconfig.c
View File

@ -399,7 +399,6 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag)
/* Save value in template as appropriate. */
switch (argInfo & POPT_ARG_MASK) {
long aLong;
case POPT_ARG_NONE:
(void) dbSaveInt(opt, argInfo, 1L);
@ -417,7 +416,7 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag)
case POPT_ARG_INT:
case POPT_ARG_LONG:
aLong = strtol(p, &pe, 0);
{ long aLong = strtol(p, &pe, 0);
if (pe) {
if (!xstrncasecmp(pe, "Mb", 2))
aLong *= 1024 * 1024;
@ -449,7 +448,7 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag)
}
(void) dbSaveInt(opt, argInfo, aLong);
}
break;
} break;
default:
break;
}

6
rpmdb/rpmdb.c
View File

@ -630,7 +630,7 @@ static INLINE int dbiAppendSet(dbiIndexSet set, const void * recs,
size_t rlen = (recsize < sizeof(*(set->recs)))
? recsize : sizeof(*(set->recs));
if (set == NULL || recs == NULL || nrecs <= 0 || recsize <= 0)
if (set == NULL || recs == NULL || nrecs <= 0 || recsize == 0)
return 1;
if (set->count == 0)
@ -1485,7 +1485,9 @@ rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi)
mire->pattern = _free(mire->pattern);
if (mire->preg != NULL) {
regfree(mire->preg);
/*@+voidabstract@*/
mire->preg = _free(mire->preg);
/*@=voidabstract@*/
}
}
mi->mi_re = _free(mi->mi_re);
@ -1726,7 +1728,9 @@ int rpmdbSetIteratorRE(rpmdbMatchIterator mi, rpmTag tag,
allpat = _free(allpat);
if (preg) {
regfree(preg);
/*@+voidabstract@*/
preg = _free(preg);
/*@=voidabstract@*/
}
/*@=kepttrans@*/
return rc;

4
rpmio/base64.c
View File

@ -101,14 +101,14 @@ fprintf(stderr, "%7u %02x %02x %02x -> %02x %02x %02x %02x\n",
c = *s++;
*te++ = b64enc[ (c >> 2) ];
*te++ = b64enc[ ((c & 0x3) << 4) | (*s >> 4) ];
if (--ns <= 0) {
if (--ns == 0) {
*te++ = '=';
*te++ = '=';
continue;
}
c = *s++;
*te++ = b64enc[ ((c & 0xf) << 2) | (*s >> 6) ];
if (--ns <= 0) {
if (--ns == 0) {
*te++ = '=';
continue;
}

6
rpmio/macro.c
View File

@ -1199,7 +1199,7 @@ expandMacro(MacroBuf mb)
/* XXX Everything below expects fe > f */
fn = (fe - f);
gn = (ge - g);
if (fn <= 0) {
if ((fe - f) <= 0) {
/* XXX Process % in unknown context */
c = '%'; /* XXX only need to save % */
SAVECHAR(mb, c);
@ -1384,7 +1384,7 @@ expandMacros(void * spec, MacroContext mc, char * s, size_t slen)
char *tbuf;
int rc;
if (s == NULL || slen <= 0)
if (s == NULL || slen == 0)
return 0;
if (mc == NULL) mc = &rpmGlobalMacroContext;
@ -1407,7 +1407,7 @@ expandMacros(void * spec, MacroContext mc, char * s, size_t slen)
rc = expandMacro(mb);
if (mb->nb <= 0)
if (mb->nb == 0)
rpmError(RPMERR_BADSPEC, _("Target buffer overflow\n"));
tbuf[slen] = '\0'; /* XXX just in case */

8
rpmio/rpmio.c
View File

@ -6,7 +6,9 @@
#include <stdarg.h>
#ifdef __LCLINT__
/*@-incondefs@*/
typedef unsigned int uint32_t;
/*@=incondefs@*/
#define INADDR_ANY ((uint32_t) 0x00000000)
#define IPPROTO_IP 0
@ -662,7 +664,9 @@ static int mygethostbyname(const char * host,
{
struct hostent * hostinfo;
hostinfo = /*@-unrecog@*/ gethostbyname(host) /*@=unrecog@*/;
/*@-unrecog -multithreaded @*/
hostinfo = gethostbyname(host);
/*@=unrecog =multithreaded @*/
if (!hostinfo) return 1;
/*@-nullderef@*/
@ -721,7 +725,7 @@ static int tcpConnect(FD_t ctrl, const char * host, int port)
if (_ftp_debug)
fprintf(stderr,"++ connect %s:%d on fdno %d\n",
/*@-unrecog@*/ inet_ntoa(sin.sin_addr) /*@=unrecog@*/ ,
ntohs(sin.sin_port), fdno);
(int)ntohs(sin.sin_port), fdno);
fdSetFdno(ctrl, (fdno >= 0 ? fdno : -1));
return 0;

6
rpmio/rpmio.h
View File

@ -281,7 +281,7 @@ int Unlink(const char * path)
/**
* readlink(2) clone.
*/
int Readlink(const char * path, char * buf, size_t bufsiz)
int Readlink(const char * path, /*@out@*/ char * buf, size_t bufsiz)
/*@modifies *buf, fileSystem @*/;
/**
@ -363,7 +363,7 @@ off_t fdSize(FD_t fd)
/*@-exportlocal@*/
/**
*/
int fdFileno(void * cookie)
/*@unused@*/ int fdFileno(void * cookie)
/*@*/;
#define fdFileno(_fd) fdio->_fileno(_fd)
@ -463,7 +463,7 @@ int ufdGetFile( /*@killref@*/ FD_t sfd, FD_t tfd)
/**
*/
int timedRead(FD_t fd, /*@out@*/ void * bufptr, int length)
/*@unused@*/ int timedRead(FD_t fd, /*@out@*/ void * bufptr, int length)
/*@modifies fd, *bufptr, fileSystem @*/;
#define timedRead ufdio->read

4
rpmio/rpmio_internal.h
View File

@ -168,6 +168,7 @@ int ufdClose( /*@only@*/ void * cookie)
/** \ingroup rpmio
*/
/*@-nullstate@*/ /* FIX: io may be NULL */
/*@unused@*/ static inline
void fdSetIo(FD_t fd, /*@kept@*/ /*@null@*/ FDIO_t io)
/*@modifies fd @*/
@ -177,6 +178,7 @@ void fdSetIo(FD_t fd, /*@kept@*/ /*@null@*/ FDIO_t io)
fd->fps[fd->nfps].io = io;
/*@=assignexpose@*/
}
/*@=nullstate@*/
/** \ingroup rpmio
*/
@ -204,6 +206,7 @@ void fdSetIo(FD_t fd, /*@kept@*/ /*@null@*/ FDIO_t io)
/** \ingroup rpmio
*/
/*@-nullstate@*/ /* FIX: fp may be NULL */
/*@unused@*/ static inline
void fdSetFp(FD_t fd, /*@kept@*/ /*@null@*/ void * fp)
/*@modifies fd @*/
@ -213,6 +216,7 @@ void fdSetFp(FD_t fd, /*@kept@*/ /*@null@*/ void * fp)
fd->fps[fd->nfps].fp = fp;
/*@=assignexpose@*/
}
/*@=nullstate@*/
/** \ingroup rpmio
*/

3
rpmio/rpmlog.c
View File

@ -130,6 +130,8 @@ static inline int vsnprintf(char * buf, /*@unused@*/ int nb,
}
#endif
/*@-compmempass@*/ /* FIX: rpmlogMsgPrefix[] dependent, not unqualified */
/*@-nullstate@*/ /* FIX: rpmlogMsgPrefix[] may be NULL */
static void vrpmlog (unsigned code, const char *fmt, va_list ap)
/*@modifies internalState @*/
{
@ -208,6 +210,7 @@ static void vrpmlog (unsigned code, const char *fmt, va_list ap)
if (pri <= RPMLOG_CRIT)
exit(EXIT_FAILURE);
}
/*@=compmempass =nullstate@*/
void rpmlog (int code, const char *fmt, ...)
{

7
rpmio/rpmrpc.c
View File

@ -466,7 +466,7 @@ static int vfs_parse_filemode (const char *p)
return res;
}
static int vfs_parse_filedate(int idx, time_t *t)
static int vfs_parse_filedate(int idx, /*@out@*/ time_t *t)
/*@modifies *t @*/
{ /* This thing parses from idx in columns[] array */
@ -789,7 +789,8 @@ static /*@only@*/ char * ftpBuf = NULL;
#define alloca_strdup(_s) strcpy(alloca(strlen(_s)+1), (_s))
static int ftpNLST(const char * url, ftpSysCall_t ftpSysCall,
/*@out@*/ struct stat * st, char * rlbuf, size_t rlbufsiz)
/*@out@*/ /*@null@*/ struct stat * st,
/*@out@*/ /*@null@*/ char * rlbuf, size_t rlbufsiz)
/*@modifies *st, *rlbuf, fileSystem @*/
{
FD_t fd;
@ -986,7 +987,7 @@ fprintf(stderr, "*** ftpLstat(%s) rc %d\n", path, rc);
return rc;
}
static int ftpReadlink(const char * path, char * buf, size_t bufsiz)
static int ftpReadlink(const char * path, /*@out@*/ char * buf, size_t bufsiz)
/*@modifies *buf @*/
{
return ftpNLST(path, DO_FTP_READLINK, NULL, buf, bufsiz);

6
rpmio/rpmurl.h
View File

@ -58,7 +58,7 @@ extern int url_iobuf_size;
* @param msg debugging identifier (unused)
* @return new instance
*/
urlinfo urlNew(const char * msg) /*@*/;
/*@unused@*/ urlinfo urlNew(const char * msg) /*@*/;
/** @todo Remove debugging entry from the ABI. */
urlinfo XurlNew(const char * msg, const char * file, unsigned line) /*@*/;
@ -70,7 +70,7 @@ urlinfo XurlNew(const char * msg, const char * file, unsigned line) /*@*/;
* @param msg debugging identifier (unused)
* @return referenced instance
*/
urlinfo urlLink(urlinfo u, const char * msg)
/*@unused@*/ urlinfo urlLink(urlinfo u, const char * msg)
/*@modifies u @*/;
/** @todo Remove debugging entry from the ABI. */
@ -84,7 +84,7 @@ urlinfo XurlLink(urlinfo u, const char * msg, const char * file, unsigned line)
* @param msg debugging identifier (unused)
* @return dereferenced instance (NULL if freed)
*/
urlinfo urlFree( /*@killref@*/ urlinfo u, const char * msg)
/*@unused@*/ urlinfo urlFree( /*@killref@*/ urlinfo u, const char * msg)
/*@modifies u @*/;
/** @todo Remove debugging entry from the ABI. */

Some files were not shown because too many files have changed in this diff Show More