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

Rename doExpandThisMacro to doMacro 

The doXXX functions now have the same argument signature and I
never liked the doExpandThisMacro name.
This commit is contained in:
Michael Schroeder 2021-10-25 10:27:04 +02:00 committed by Panu Matilainen
parent 1d1f461f80
commit 243d01ff46
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpmio/macro.c
View File

@ -1318,7 +1318,7 @@ const char *findMacroEnd(const char *str)
* @param parsed how many characters ME_PARSE parsed (or NULL) * @param parsed how many characters ME_PARSE parsed (or NULL)
*/ */
static void static void
doExpandThisMacro(MacroBuf mb, rpmMacroEntry me, ARGV_t args, size_t *parsed) doMacro(MacroBuf mb, rpmMacroEntry me, ARGV_t args, size_t *parsed)
{ {
rpmMacroEntry prevme = mb->me; rpmMacroEntry prevme = mb->me;
ARGV_t prevarg = mb->args; ARGV_t prevarg = mb->args;
@ -1500,7 +1500,7 @@ expandMacro(MacroBuf mb, const char *src, size_t slen)
if (g && g < ge) { /* Expand X in %{...:X} */ if (g && g < ge) { /* Expand X in %{...:X} */
expandMacro(mb, g, gn); expandMacro(mb, g, gn);
} else if (me) { } else if (me) {
doExpandThisMacro(mb, me, NULL, NULL); doMacro(mb, me, NULL, NULL);
} }
s = se; s = se;
continue; continue;
@ -1526,7 +1526,7 @@ expandMacro(MacroBuf mb, const char *src, size_t slen)
fwd = (grabArgs(mb, me, &args, fe, lastc, 1) - se); fwd = (grabArgs(mb, me, &args, fe, lastc, 1) - se);
} }
} }
doExpandThisMacro(mb, me, args, &fwd); doMacro(mb, me, args, &fwd);
if (args != NULL) if (args != NULL)
argvFree(args); argvFree(args);
s = se + (g ? 0 : fwd); s = se + (g ? 0 : fwd);
@ -1579,7 +1579,7 @@ expandThisMacro(MacroBuf mb, rpmMacroEntry me, ARGV_const_t args, int flags)
} }
} }
doExpandThisMacro(mb, me, optargs, NULL); doMacro(mb, me, optargs, NULL);
if (optargs) if (optargs)
argvFree(optargs); argvFree(optargs);