From 441272ff97b2dec4c3566239acf501c88f3026c8 Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Thu, 26 Apr 2012 12:40:13 +0200 Subject: Reduce overhead by leaving rc_deptree_update_needed() as soon as possible There's no need to check any further if we're returning true anyway. Signed-off-by: Christian Ruppert --- src/librc/librc-depend.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c index 3aa9457..5e99c1b 100644 --- a/src/librc/librc-depend.c +++ b/src/librc/librc-depend.c @@ -687,27 +687,27 @@ rc_deptree_update_needed(time_t *newest, char *file) if (!existss(RC_DEPTREE_CACHE)) return true; if (!rc_newer_than(RC_DEPTREE_CACHE, RC_INITDIR, newest, file)) - newer = true; + return true; if (!rc_newer_than(RC_DEPTREE_CACHE, RC_CONFDIR, newest, file)) - newer = true; + return true; #ifdef RC_PKG_INITDIR if (!rc_newer_than(RC_DEPTREE_CACHE, RC_PKG_INITDIR, newest, file)) - newer = true; + return true; #endif #ifdef RC_PKG_CONFDIR if (!rc_newer_than(RC_DEPTREE_CACHE, RC_PKG_CONFDIR, newest, file)) - newer = true; + return true; #endif #ifdef RC_LOCAL_INITDIR if (!rc_newer_than(RC_DEPTREE_CACHE, RC_LOCAL_INITDIR, newest, file)) - newer = true; + return true; #endif #ifdef RC_LOCAL_CONFDIR if (!rc_newer_than(RC_DEPTREE_CACHE, RC_LOCAL_CONFDIR, newest, file)) - newer = true; + return true; #endif if (!rc_newer_than(RC_DEPTREE_CACHE, RC_CONF, newest, file)) - newer = true; + return true; /* Some init scripts dependencies change depending on config files * outside of baselayout, like syslog-ng, so we check those too. */ @@ -715,8 +715,7 @@ rc_deptree_update_needed(time_t *newest, char *file) TAILQ_FOREACH(s, config, entries) { if (!rc_newer_than(RC_DEPTREE_CACHE, s->value, newest, file)) { newer = true; - if (newest == NULL) - break; + break; } } rc_stringlist_free(config); -- cgit v1.2.3