diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2011-09-12 12:54:48 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2011-09-12 12:57:23 +0300 |
| commit | 5b9681afee60e3049306b5daa16924011bebed20 (patch) | |
| tree | 36ccd453d863665878686794567278cc6991fc39 /lib | |
| parent | 9e363dba038ee7b7c8fae330a6931211e61e8678 (diff) | |
| download | rpm-5b9681afee60e3049306b5daa16924011bebed20.tar.gz rpm-5b9681afee60e3049306b5daa16924011bebed20.tar.bz2 rpm-5b9681afee60e3049306b5daa16924011bebed20.zip | |
Rename scriptlet flags from RPMSCRIPT_FOO to RPMSCRIPT_FLAG_FOO
- No functional changes (and this is still internal-only API),
just making more obvious what they are and clearing the
RPMSCRIPT_FOO namespace for possible future use for the scriptlet
types themselves.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rpmscript.c | 4 | ||||
| -rw-r--r-- | lib/rpmscript.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/rpmscript.c b/lib/rpmscript.c index 9ab2c7da7..66ab94486 100644 --- a/lib/rpmscript.c +++ b/lib/rpmscript.c @@ -382,12 +382,12 @@ static rpmScript rpmScriptNew(Header h, rpmTagVal tag, const char *body, rasprintf(&script->descr, "%s(%s)", tag2sln(tag), nevra); /* macros need to be expanded before possible queryformat */ - if (script->body && (flags & RPMSCRIPT_EXPAND)) { + if (script->body && (flags & RPMSCRIPT_FLAG_EXPAND)) { char *body = rpmExpand(script->body, NULL); free(script->body); script->body = body; } - if (script->body && (flags & RPMSCRIPT_QFORMAT)) { + if (script->body && (flags & RPMSCRIPT_FLAG_QFORMAT)) { /* XXX TODO: handle queryformat errors */ char *body = headerFormat(h, script->body, NULL); free(script->body); diff --git a/lib/rpmscript.h b/lib/rpmscript.h index 1d87b0d95..7d584bcd9 100644 --- a/lib/rpmscript.h +++ b/lib/rpmscript.h @@ -5,9 +5,9 @@ #include <rpm/argv.h> enum rpmscriptFlags_e { - RPMSCRIPT_NONE = 0, - RPMSCRIPT_EXPAND = (1 << 0), /* macro expansion */ - RPMSCRIPT_QFORMAT = (1 << 1), /* header queryformat expansion */ + RPMSCRIPT_FLAG_NONE = 0, + RPMSCRIPT_FLAG_EXPAND = (1 << 0), /* macro expansion */ + RPMSCRIPT_FLAG_QFORMAT = (1 << 1), /* header queryformat expansion */ }; typedef rpmFlags rpmscriptFlags; |