From bdf05eca34d74d8220031dc8e672ba4d9209a800 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Fri, 16 Apr 2010 18:12:26 -0400 Subject: Use the action helper functions in a few more places Signed-off-by: Doug Ledford --- config.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'config.c') diff --git a/config.c b/config.c index 30764c9..3242f5f 100644 --- a/config.c +++ b/config.c @@ -855,8 +855,7 @@ void domainline(char *line) } } /* Some sanity checks now that all the options are parsed */ - if ((de->action & force) && - ((de->action & action_mask) <= incremental)) { + if (force(de) && (action(de) <= incremental)) { fprintf(stderr, Name ": force makes no sense with ignore or " "incremental, removing.\n"); de->action &= action_mask; @@ -867,7 +866,7 @@ void domainline(char *line) free(de->spare_group); de->spare_group = NULL; } - if ((de->action & action_mask) == partition) { + if (action(de) == partition) { for (prev_path = NULL, path = de->paths; path; ) if ((strstr(path->path, "part") != NULL) || (path->path[strlen(path->path) - 1] == '*')) { -- cgit