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

Refactor %{verbose:...} handling out of doFoo() 

%{verbose:...} is special due to conditional expansion so it makes
sense to have the logic separated. No functional changes.
This commit is contained in:
Panu Matilainen 2020-02-10 13:47:27 +02:00
parent 47dbb3e070
commit abcb0af241
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rpmio/macro.c
View File

@ -148,6 +148,8 @@ static void doTrace(MacroBuf mb, int chkexist, int negate,
const char * f, size_t fn, const char * g, size_t gn); const char * f, size_t fn, const char * g, size_t gn);
static void doUncompress(MacroBuf mb, int chkexist, int negate, static void doUncompress(MacroBuf mb, int chkexist, int negate,
const char * f, size_t fn, const char * g, size_t gn); const char * f, size_t fn, const char * g, size_t gn);
static void doVerbose(MacroBuf mb, int chkexist, int negate,
const char * f, size_t fn, const char * g, size_t gn);
static const char * doDef(MacroBuf mb, const char * se); static const char * doDef(MacroBuf mb, const char * se);
static const char * doGlobal(MacroBuf mb, const char * se); static const char * doGlobal(MacroBuf mb, const char * se);
@ -584,7 +586,7 @@ static struct builtins_s {
{ STR_AND_LEN("uncompress"),doUncompress, NULL, 1 }, { STR_AND_LEN("uncompress"),doUncompress, NULL, 1 },
{ STR_AND_LEN("undefine"), NULL, doUndefine, 0 }, { STR_AND_LEN("undefine"), NULL, doUndefine, 0 },
{ STR_AND_LEN("url2path"), doFoo, NULL, 1 }, { STR_AND_LEN("url2path"), doFoo, NULL, 1 },
{ STR_AND_LEN("verbose"), doFoo, NULL, 1 }, { STR_AND_LEN("verbose"), doVerbose, NULL, 1 },
{ STR_AND_LEN("warn"), doOutput, NULL, 1 }, { STR_AND_LEN("warn"), doOutput, NULL, 1 },
}; };
static const size_t numbuiltins = sizeof(builtinmacros)/sizeof(*builtinmacros); static const size_t numbuiltins = sizeof(builtinmacros)/sizeof(*builtinmacros);
@ -1148,6 +1150,19 @@ static void doExpand(MacroBuf mb, int chkexist, int negate,
} }
} }
static void doVerbose(MacroBuf mb, int chkexist, int negate,
const char * f, size_t fn, const char * g, size_t gn)
{
int verbose = (rpmIsVerbose() != 0);
/* Don't expand %{verbose:...} argument on false condition */
if (verbose != negate) {
char *buf = NULL;
expandThis(mb, g, gn, &buf);
mbAppendStr(mb, buf);
free(buf);
}
}
/** /**
* Execute macro primitives. * Execute macro primitives.
* @param mb macro expansion state * @param mb macro expansion state
@ -1164,13 +1179,8 @@ doFoo(MacroBuf mb, int chkexist, int negate, const char * f, size_t fn,
{ {
char *buf = NULL; char *buf = NULL;
char *b = NULL; char *b = NULL;
int verbose = (rpmIsVerbose() != 0);
int expand = (g != NULL && gn > 0); int expand = (g != NULL && gn > 0);
/* Don't expand %{verbose:...} argument on false condition */
if (STREQ("verbose", f, fn) && (verbose == negate))
expand = 0;
if (expand) { if (expand) {
(void) expandThis(mb, g, gn, &buf); (void) expandThis(mb, g, gn, &buf);
} else { } else {
@ -1216,8 +1226,6 @@ doFoo(MacroBuf mb, int chkexist, int negate, const char * f, size_t fn,
} else if (STREQ("suffix", f, fn)) { } else if (STREQ("suffix", f, fn)) {
if ((b = strrchr(buf, '.')) != NULL) if ((b = strrchr(buf, '.')) != NULL)
b++; b++;
} else if STREQ("verbose", f, fn) {
b = buf;
} else if (STREQ("expr", f, fn)) { } else if (STREQ("expr", f, fn)) {
char *expr = rpmExprStr(buf, 0); char *expr = rpmExprStr(buf, 0);
if (expr) { if (expr) {