diff options
| author | Renato Botelho <renato@netgate.com> | 2017-02-09 11:26:48 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-02-09 11:26:48 -0200 |
| commit | 4a05f5440acda223e6a0ec5157bc32ecc0f09ff9 (patch) | |
| tree | 4c2ece480e5d4155ed35bec62996de40eb179f18 /tests/sys/mac | |
| parent | 681a482d8fc4bfc14a24f7a9d75cca6337f2a520 (diff) | |
| parent | a1e52233c91fd46e666297270ab655f1abff8535 (diff) | |
| download | FreeBSD-src-4a05f5440acda223e6a0ec5157bc32ecc0f09ff9.zip FreeBSD-src-4a05f5440acda223e6a0ec5157bc32ecc0f09ff9.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'tests/sys/mac')
| -rw-r--r-- | tests/sys/mac/bsdextended/ugidfw_test.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/sys/mac/bsdextended/ugidfw_test.c b/tests/sys/mac/bsdextended/ugidfw_test.c index aab8553..57a283b 100644 --- a/tests/sys/mac/bsdextended/ugidfw_test.c +++ b/tests/sys/mac/bsdextended/ugidfw_test.c @@ -71,7 +71,7 @@ static const char *test_groups[] = { "bin", }; -int test_num; +static int test_num; /* * List of test strings that must go in (and come out) of libugidfw intact. @@ -149,7 +149,8 @@ test_libugidfw_strings(void) struct mac_bsdextended_rule rule; char errorstr[256]; char rulestr[256]; - int error, i; + size_t i; + int error; for (i = 0; i < nitems(test_users); i++, test_num++) { if (getpwnam(test_users[i]) == NULL) @@ -171,7 +172,7 @@ test_libugidfw_strings(void) error = bsde_parse_rule_string(test_strings[i], &rule, sizeof(errorstr), errorstr); if (error == -1) - printf("not ok %d # bsde_parse_rule_string: '%s' (%d) " + printf("not ok %d # bsde_parse_rule_string: '%s' (%zu) " "failed: %s\n", test_num, test_strings[i], i, errorstr); else printf("ok %d\n", test_num); @@ -221,7 +222,7 @@ main(void) return (0); } - printf("1..%lu\n", nitems(test_users) + nitems(test_groups) + + printf("1..%zu\n", nitems(test_users) + nitems(test_groups) + 3 * nitems(test_strings) + 2); test_libugidfw_strings(); |
