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

rpmmacro.h (rpmGetPath, rpmExpand): Add __attribute__ ((sentinel))

Browse Source 
(cherry picked from commit 328d65def9)
This commit is contained in:
Дмитрий Левин 2008-11-13 01:38:17 +00:00 committed by Alexey Tourbin
parent e350f7fcf1
commit 3d4f77766e
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.c
View File

@ -274,7 +274,7 @@ static int buildForTarget(const char * arg, BTA_t ba,
} }
#undef _anyarch #undef _anyarch
char *br_build = rpmExpand("%{?_buildrequires_build}", 0); char *br_build = rpmExpand("%{?_buildrequires_build}", NULL);
if (spec->packages && br_build && *br_build) { if (spec->packages && br_build && *br_build) {
if (parseRCPOT (spec, spec->packages, br_build, RPMTAG_BUILDREQUIRES, 0, RPMSENSE_SCRIPT_BUILD)) { if (parseRCPOT (spec, spec->packages, br_build, RPMTAG_BUILDREQUIRES, 0, RPMSENSE_SCRIPT_BUILD)) {
rc = 1; rc = 1;

4
build/files.c
View File

@ -2757,7 +2757,7 @@ static int generateDepends(Spec spec, Package pkg, TFI_t cpioList, int multiLib)
Fclose(xfd); Fclose(xfd);
runCmd = rpmExpand( "%{?___build_cmd}", " ", runScript, 0 ); runCmd = rpmExpand("%{?___build_cmd}", " ", runScript, NULL);
poptParseArgvString(runCmd, &argc, &argv); poptParseArgvString(runCmd, &argc, &argv);
@ -3017,7 +3017,7 @@ static int checkFiles(Spec spec, StringBuf fileList, int fileListLen)
Fclose(xfd); Fclose(xfd);
runCmd = rpmExpand( "%{?___build_cmd}", " ", runScript, 0 ); runCmd = rpmExpand("%{?___build_cmd}", " ", runScript, NULL);
if (!((rc = poptParseArgvString(runCmd, &ac, (const char ***)&av)) == 0 if (!((rc = poptParseArgvString(runCmd, &ac, (const char ***)&av)) == 0
&& ac > 0 && av != NULL)) && ac > 0 && av != NULL))

2
rpmio/rpmmacro.h
View File

@ -172,6 +172,7 @@ int isCompressed (const char * file,
* @return macro expansion (malloc'ed) * @return macro expansion (malloc'ed)
*/ */
char * rpmExpand (/*@null@*/ const char * arg, ...) char * rpmExpand (/*@null@*/ const char * arg, ...)
__attribute__ ((sentinel))
/*@globals rpmGlobalMacroContext @*/ /*@globals rpmGlobalMacroContext @*/
/*@modifies rpmGlobalMacroContext @*/; /*@modifies rpmGlobalMacroContext @*/;
@ -190,6 +191,7 @@ char * rpmExpand (/*@null@*/ const char * arg, ...)
*/ */
/*@-redecl@*/ /* LCL: shrug */ /*@-redecl@*/ /* LCL: shrug */
const char * rpmGetPath (/*@null@*/ const char * path, ...) const char * rpmGetPath (/*@null@*/ const char * path, ...)
__attribute__ ((sentinel))
/*@globals rpmGlobalMacroContext @*/ /*@globals rpmGlobalMacroContext @*/
/*@modifies rpmGlobalMacroContext @*/; /*@modifies rpmGlobalMacroContext @*/;
/*@=redecl@*/ /*@=redecl@*/