From owner-svn-src-all@FreeBSD.ORG Thu Jun 11 01:22:28 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82F6461D; Thu, 11 Jun 2015 01:22:28 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5714C116D; Thu, 11 Jun 2015 01:22:28 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5B1MS9T003819; Thu, 11 Jun 2015 01:22:28 GMT (envelope-from araujo@FreeBSD.org) Received: (from araujo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5B1MSJL003818; Thu, 11 Jun 2015 01:22:28 GMT (envelope-from araujo@FreeBSD.org) Message-Id: <201506110122.t5B1MSJL003818@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: araujo set sender to araujo@FreeBSD.org using -f From: Marcelo Araujo Date: Thu, 11 Jun 2015 01:22:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284251 - head/lib/libugidfw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2015 01:22:28 -0000 Author: araujo (ports committer) Date: Thu Jun 11 01:22:27 2015 New Revision: 284251 URL: https://svnweb.freebsd.org/changeset/base/284251 Log: Remove unnecessary variable and fix the usage of sysctl(3). Differential Revision: D2733 Reviewed by: ngie, kib Modified: head/lib/libugidfw/ugidfw.c Modified: head/lib/libugidfw/ugidfw.c ============================================================================== --- head/lib/libugidfw/ugidfw.c Thu Jun 11 00:24:33 2015 (r284250) +++ head/lib/libugidfw/ugidfw.c Thu Jun 11 01:22:27 2015 (r284251) @@ -1232,7 +1232,7 @@ bsde_delete_rule(int rulenum, size_t buf name[len] = rulenum; len++; - error = sysctl(name, len, NULL, NULL, &rule, 0); + error = sysctl(name, len, NULL, NULL, &rule, sizeof(rule)); if (error) { len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", rulenum, strerror(errno)); @@ -1247,7 +1247,7 @@ bsde_set_rule(int rulenum, struct mac_bs char *errstr) { int name[10]; - size_t len, size; + size_t len; int error; if (bsde_check_version(buflen, errstr) != 0) @@ -1264,8 +1264,7 @@ bsde_set_rule(int rulenum, struct mac_bs name[len] = rulenum; len++; - size = sizeof(*rule); - error = sysctl(name, len, NULL, NULL, rule, size); + error = sysctl(name, len, NULL, NULL, rule, sizeof(*rule)); if (error) { len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", rulenum, strerror(errno)); @@ -1281,7 +1280,7 @@ bsde_add_rule(int *rulenum, struct mac_b { char charstr[BUFSIZ]; int name[10]; - size_t len, size; + size_t len; int error, rule_slots; if (bsde_check_version(buflen, errstr) != 0) @@ -1305,8 +1304,7 @@ bsde_add_rule(int *rulenum, struct mac_b name[len] = rule_slots; len++; - size = sizeof(*rule); - error = sysctl(name, len, NULL, NULL, rule, size); + error = sysctl(name, len, NULL, NULL, rule, sizeof(*rule)); if (error) { len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", rule_slots, strerror(errno));