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

Reindent expandMacro() to common rpm style 

This huge and scary looking diff is strictly whitespace-only change.
This commit is contained in:
Panu Matilainen 2017-01-19 11:26:52 +02:00
parent 34c4609df3
commit e3e99e929a
1 changed files with 185 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rpmio/macro.c
View File

@ -1028,8 +1028,7 @@ expandMacro(MacroBuf mb, const char *src, size_t slen)
break;
case '(': /* %(...) shell escape */
if ((se = matchchar(s, c, ')')) == NULL) {
rpmlog(RPMLOG_ERR,
_("Unterminated %c: %s\n"), (char)c, s);
rpmlog(RPMLOG_ERR, _("Unterminated %c: %s\n"), (char)c, s);
rc = 1;
continue;
}
@ -1045,8 +1044,7 @@ expandMacro(MacroBuf mb, const char *src, size_t slen)
break;
case '{': /* %{...}/%{...:...} substitution */
if ((se = matchchar(s, c, '}')) == NULL) {
rpmlog(RPMLOG_ERR,
_("Unterminated %c: %s\n"), (char)c, s);
rpmlog(RPMLOG_ERR, _("Unterminated %c: %s\n"), (char)c, s);
rc = 1;
continue;
}
@ -1082,7 +1080,7 @@ expandMacro(MacroBuf mb, const char *src, size_t slen)
fn = (fe - f);
gn = (ge - g);
if ((fe - f) <= 0) {
/* XXX Process % in unknown context */
/* XXX Process % in unknown context */
c = '%'; /* XXX only need to save % */
mbAppend(mb, c);
#if 0
@ -1102,8 +1100,7 @@ expandMacro(MacroBuf mb, const char *src, size_t slen)
if (g && gn > 0 && expandThis(mb, g, gn, &arg) == 0) {
/* Print failure iff %{load:...} or %{!?load:...} */
if (loadMacroFile(mb->mc, arg) && chkexist == negate) {
rpmlog(RPMLOG_ERR,
_("failed to load macro file %s"), arg);
rpmlog(RPMLOG_ERR, _("failed to load macro file %s"), arg);
}
}
free(arg);
@ -1191,7 +1188,8 @@ expandMacro(MacroBuf mb, const char *src, size_t slen)
STREQ("getconfdir", f, fn) ||
STREQ("S", f, fn) ||
STREQ("P", f, fn) ||
STREQ("F", f, fn)) {
STREQ("F", f, fn))
{
/* FIX: verbose may be set */
doFoo(mb, negate, f, fn, g, gn);
s = se;