Date: Mon, 21 Dec 2015 07:04:01 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r292530 - head/tools/regression/mac/mac_bsdextended Message-ID: <201512210704.tBL741w4047817@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Mon Dec 21 07:04:01 2015 New Revision: 292530 URL: https://svnweb.freebsd.org/changeset/base/292530 Log: - Use 1 for an exit code instead of -1 with err, errx, and exit - Add unistd.h for getuid(3) - Sort #includes MFC after: 1 week Sponsored by: EMC / Isilon Storage Division Modified: head/tools/regression/mac/mac_bsdextended/test_ugidfw.c Modified: head/tools/regression/mac/mac_bsdextended/test_ugidfw.c ============================================================================== --- head/tools/regression/mac/mac_bsdextended/test_ugidfw.c Mon Dec 21 05:08:20 2015 (r292529) +++ head/tools/regression/mac/mac_bsdextended/test_ugidfw.c Mon Dec 21 07:04:01 2015 (r292530) @@ -35,10 +35,11 @@ #include <err.h> #include <grp.h> #include <pwd.h> -#include <ugidfw.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <ugidfw.h> +#include <unistd.h> /* * Starting point for a regression test for mac_bsdextended(4) and the @@ -49,7 +50,7 @@ usage(void) { fprintf(stderr, "test_ugidfw\n"); - exit(-1); + exit(1); } /* @@ -159,13 +160,13 @@ test_libugidfw_strings(void) for (i = 0; i < test_users_len; i++) { if (getpwnam(test_users[i]) == NULL) - err(-1, "test_libugidfw_strings: getpwnam: %s", + err(1, "test_libugidfw_strings: getpwnam: %s", test_users[i]); } for (i = 0; i < test_groups_len; i++) { if (getgrnam(test_groups[i]) == NULL) - err(-1, "test_libugidfw_strings: getgrnam: %s", + err(1, "test_libugidfw_strings: getgrnam: %s", test_groups[i]); } @@ -173,15 +174,15 @@ test_libugidfw_strings(void) error = bsde_parse_rule_string(test_strings[i], &rule, sizeof(errorstr), errorstr); if (error == -1) - errx(-1, "bsde_parse_rule_string: '%s' (%d): %s", + errx(1, "bsde_parse_rule_string: '%s' (%d): %s", test_strings[i], i, errorstr); error = bsde_rule_to_string(&rule, rulestr, sizeof(rulestr)); if (error < 0) - errx(-1, "bsde_rule_to_string: rule for '%s' " + errx(1, "bsde_rule_to_string: rule for '%s' " "returned %d", test_strings[i], error); if (strcmp(test_strings[i], rulestr) != 0) - errx(-1, "test_libugidfw: '%s' in, '%s' out", + errx(1, "test_libugidfw: '%s' in, '%s' out", test_strings[i], rulestr); } } @@ -210,12 +211,12 @@ main(int argc, char *argv[]) switch (mac_is_present("bsdextended")) { case -1: - err(-1, "mac_is_present"); + err(1, "mac_is_present"); case 1: break; case 0: default: - errx(-1, "mac_bsdextended not loaded"); + errx(1, "mac_bsdextended not loaded"); } /* @@ -226,13 +227,13 @@ main(int argc, char *argv[]) */ count = bsde_get_rule_count(sizeof(errorstr), errorstr); if (count == -1) - errx(-1, "bsde_get_rule_count: %s", errorstr); + errx(1, "bsde_get_rule_count: %s", errorstr); if (count != 0) - errx(-1, "bsde_get_rule_count: %d rules", count); + errx(1, "bsde_get_rule_count: %d rules", count); slots = bsde_get_rule_slots(sizeof(errorstr), errorstr); if (slots == -1) - errx(-1, "bsde_get_rule_slots: %s", errorstr); + errx(1, "bsde_get_rule_slots: %s", errorstr); return (0); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512210704.tBL741w4047817>