wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-27 12:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify, drop ifdef: let if: become ifdef

Browse Source 
Post audit, concensus is to drop if: and always do post-eval of all
ifdef: statements.  Also, rename ifdef: to if: for completeness.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2023-03-06 17:03:37 +01:00
1 parent 571250a9b9
commit 44d0d87ad3
4 files changed
+20 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/svc.c
+12 -4
View File
@@ -686,6 +686,14 @@ int svc_conflicts(svc_t *svc)
return rc;
}
/**
* svc_ifthen - Check if: statement in declaration
* @ident: svc_t identififcation (name:id)
* @stmt: if: statement from .conf file
*
* Returns:
* %TRUE(1) yes, use this svc_t, %FALSE(0) prune
*/
int svc_ifthen(const char *ident, char *stmt)
{
int not = 0;
@@ -710,11 +718,11 @@ int svc_ifthen(const char *ident, char *stmt)
cond = cond_get(stmt);
if (not && cond == COND_ON) {
dbg("skipping %s, cond %s is on", ident, stmt);
logit(LOG_NOTICE, "skipping %s, cond %s is on.", ident, stmt);
return 0;
}
if (!not && cond == COND_OFF) {
dbg("skipping %s, cond %s is off", ident, stmt);
logit(LOG_NOTICE, "skipping %s, cond %s is off.", ident, stmt);
return 0;
}
return 1;
@@ -727,11 +735,11 @@ int svc_ifthen(const char *ident, char *stmt)
svc = svc_find_by_str(stmt);
if (not && svc) {
dbg("skipping %s, %s already loaded.", ident, svc_ident(svc, NULL, 0));
logit(LOG_NOTICE, "skipping %s, %s already loaded.", ident, svc_ident(svc, NULL, 0));
return 0;
}
if (!not && !svc) {
dbg("skipping %s, %s not available.", ident, stmt);
logit(LOG_NOTICE, "skipping %s, %s not available.", ident, stmt);
return 0;
}