From 8444c6f997dd0eb2a26b6870768b5bd049247db9 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 14 Apr 2008 14:33:23 +0300 Subject: [PATCH] Reduce #ifdef clutter --- lib/psm.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/psm.c b/lib/psm.c index 35feead..829666a 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -494,7 +494,6 @@ static pid_t psmWait(rpmpsm psm) return psm->sq.reaped; } -#ifdef WITH_LUA /** * Run internal Lua script. */ @@ -502,6 +501,7 @@ static rpmRC runLuaScript(rpmpsm psm, Header h, rpmTag stag, unsigned int progArgc, const char **progArgv, const char *script, int arg1, int arg2) { +#ifdef WITH_LUA const rpmts ts = psm->ts; char *nevra, *sname = NULL; int rootFd = -1; @@ -570,8 +570,10 @@ static rpmRC runLuaScript(rpmpsm psm, Header h, rpmTag stag, free(sname); return rc; -} +#else + return RPMRC_FAIL; #endif +} /** */ @@ -628,12 +630,8 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, xx = hge(h, RPMTAG_ARCH, NULL, (rpm_data_t *) &a, NULL); if (progArgv && strcmp(progArgv[0], "") == 0) { -#ifdef WITH_LUA return runLuaScript(psm, h, stag, progArgc, progArgv, script, arg1, arg2); -#else - return RPMRC_FAIL; -#endif } psm->sq.reaper = 1; -- 2.7.4