X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib_internal%2Fmatchlist-compare.c;h=2cff7e2bd8359d620fa6b3a4f8d193e06a182f9b;hb=f43cee695997d8f2e1375abfd423fc82dc8b96cd;hp=7f15ec574e07a044d369097d4f8d462c1acbf68e;hpb=5269e9607d89ac4dbd34f9adb5b14fb5dfc9b1a5;p=util-vserver.git diff --git a/util-vserver/lib_internal/matchlist-compare.c b/util-vserver/lib_internal/matchlist-compare.c index 7f15ec5..2cff7e2 100644 --- a/util-vserver/lib_internal/matchlist-compare.c +++ b/util-vserver/lib_internal/matchlist-compare.c @@ -23,10 +23,9 @@ #include "matchlist.h" #include -bool +MatchType MatchList_compare(struct MatchList const *list, char const *path) { - bool res = true; struct MatchItem const * ptr = list->data; struct MatchItem const * const end_ptr = list->data + list->count; @@ -34,15 +33,9 @@ MatchList_compare(struct MatchList const *list, char const *path) //write(1, "\n", 1); for (; ptrcmp==0 && strcmp(ptr->name, path)==0) || - (ptr->cmp!=0 && (ptr->cmp)(ptr->name, path)==0)) { - switch (ptr->type) { - case stINCLUDE : res = true; break; - case stEXCLUDE : res = false; break; - default : abort(); - } - break; - } + (ptr->cmp!=0 && (ptr->cmp)(ptr->name, path)==0)) + return ptr->type; } - return res; + return stINCLUDE; }