From: Enrico Scholz Date: Sun, 24 Apr 2005 20:24:36 +0000 (+0000) Subject: made it compatible to the new utilvserver_listparser_uint*() API and X-Git-Tag: version_0_30_210~243 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63d5487b9775ce7c380334a99211180caae603f5;p=util-vserver.git made it compatible to the new utilvserver_listparser_uint*() API and added wrappers with a third 'bool *' arg git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2038 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/lib/bcaps_list-v13.c b/util-vserver/lib/bcaps_list-v13.c index c61014e..27ea3b4 100644 --- a/util-vserver/lib/bcaps_list-v13.c +++ b/util-vserver/lib/bcaps_list-v13.c @@ -25,6 +25,14 @@ #include +static uint_least64_t +vc_text2bcap_err(char const *str, size_t len, bool *failed) +{ + uint_least64_t res = vc_text2bcap(str, len); + if (res==0) *failed = true; + return res; +} + int vc_list2bcap(char const *str, size_t len, struct vc_err_listparser *err, @@ -34,5 +42,5 @@ vc_list2bcap(char const *str, size_t len, err ? &err->ptr : 0, err ? &err->len : 0, &caps->bcaps, &caps->bmask, - vc_text2bcap); + vc_text2bcap_err); } diff --git a/util-vserver/lib/ccaps_list-v13.c b/util-vserver/lib/ccaps_list-v13.c index f52bfe7..c2a8016 100644 --- a/util-vserver/lib/ccaps_list-v13.c +++ b/util-vserver/lib/ccaps_list-v13.c @@ -25,6 +25,14 @@ #include +static uint_least64_t +vc_text2ccap_err(char const *str, size_t len, bool *failed) +{ + uint_least64_t res = vc_text2ccap(str, len); + if (res==0) *failed = true; + return res; +} + int vc_list2ccap(char const *str, size_t len, struct vc_err_listparser *err, @@ -34,5 +42,5 @@ vc_list2ccap(char const *str, size_t len, err ? &err->ptr : 0, err ? &err->len : 0, &caps->ccaps, &caps->cmask, - vc_text2ccap); + vc_text2ccap_err); } diff --git a/util-vserver/lib/cflags_list-v13.c b/util-vserver/lib/cflags_list-v13.c index ea14e64..4865725 100644 --- a/util-vserver/lib/cflags_list-v13.c +++ b/util-vserver/lib/cflags_list-v13.c @@ -25,6 +25,14 @@ #include +static uint_least64_t +vc_text2cflag_err(char const *str, size_t len, bool *failed) +{ + uint_least64_t res = vc_text2cflag(str, len); + if (res==0) *failed = true; + return res; +} + int vc_list2cflag(char const *str, size_t len, struct vc_err_listparser *err, @@ -34,5 +42,5 @@ vc_list2cflag(char const *str, size_t len, err ? &err->ptr : 0, err ? &err->len : 0, &flags->flagword, &flags->mask, - vc_text2cflag); + vc_text2cflag_err); } diff --git a/util-vserver/lib/ncaps_list-net.c b/util-vserver/lib/ncaps_list-net.c index dbc3c01..1a7a5f7 100644 --- a/util-vserver/lib/ncaps_list-net.c +++ b/util-vserver/lib/ncaps_list-net.c @@ -25,6 +25,15 @@ #include +static uint_least64_t +vc_text2ncap_err(char const *str, size_t len, bool *failed) +{ + uint_least64_t res = vc_text2ncap(str, len); + + if (res==0) *failed = true; + return res; +} + int vc_list2ncap(char const *str, size_t len, struct vc_err_listparser *err, @@ -34,5 +43,5 @@ vc_list2ncap(char const *str, size_t len, err ? &err->ptr : 0, err ? &err->len : 0, &caps->ncaps, &caps->cmask, - vc_text2ncap); + vc_text2ncap_err); } diff --git a/util-vserver/lib/nflags_list-net.c b/util-vserver/lib/nflags_list-net.c index c95dd36..28bea76 100644 --- a/util-vserver/lib/nflags_list-net.c +++ b/util-vserver/lib/nflags_list-net.c @@ -25,6 +25,15 @@ #include +static uint_least64_t +vc_text2nflag_err(char const *str, size_t len, bool *failed) +{ + uint_least64_t res = vc_text2nflag(str, len); + + if (res==0) *failed = true; + return res; +} + int vc_list2nflag(char const *str, size_t len, struct vc_err_listparser *err, @@ -34,5 +43,5 @@ vc_list2nflag(char const *str, size_t len, err ? &err->ptr : 0, err ? &err->len : 0, &flags->flagword, &flags->mask, - vc_text2nflag); + vc_text2nflag_err); }