From owner-svn-src-all@FreeBSD.ORG Sat Oct 23 22:04:38 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1665C106564A; Sat, 23 Oct 2010 22:04:38 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 045D18FC1A; Sat, 23 Oct 2010 22:04:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9NM4bgM003382; Sat, 23 Oct 2010 22:04:37 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9NM4bPW003379; Sat, 23 Oct 2010 22:04:37 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201010232204.o9NM4bPW003379@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Sat, 23 Oct 2010 22:04:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r214253 - stable/8/sbin/geom/core X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Sat, 23 Oct 2010 22:04:38 -0000 Author: pjd Date: Sat Oct 23 22:04:37 2010 New Revision: 214253 URL: http://svn.freebsd.org/changeset/base/214253 Log: Constify go_val field. (Should've been MFC of r212547.) Modified: stable/8/sbin/geom/core/geom.c stable/8/sbin/geom/core/geom.h Modified: stable/8/sbin/geom/core/geom.c ============================================================================== --- stable/8/sbin/geom/core/geom.c Sat Oct 23 21:56:50 2010 (r214252) +++ stable/8/sbin/geom/core/geom.c Sat Oct 23 22:04:37 2010 (r214253) @@ -257,10 +257,11 @@ set_option(struct g_command *cmd, struct err(EXIT_FAILURE, "Invalid value for '%c' argument", opt->go_char); } - opt->go_val = malloc(sizeof(intmax_t)); - if (opt->go_val == NULL) + ptr = malloc(sizeof(intmax_t)); + if (ptr == NULL) errx(EXIT_FAILURE, "No memory."); - *(intmax_t *)opt->go_val = number; + *(intmax_t *)ptr = number; + opt->go_val = ptr; gctl_ro_param(req, opt->go_name, sizeof(intmax_t), opt->go_val); } else if (G_OPT_TYPE(opt) == G_TYPE_ASCNUM) { if (cmd->gc_argname == NULL || *val != '\0') { @@ -280,10 +281,11 @@ set_option(struct g_command *cmd, struct if (cmd->gc_argname == NULL || *val != '\0') gctl_ro_param(req, opt->go_name, -1, val); } else if (G_OPT_TYPE(opt) == G_TYPE_BOOL) { - opt->go_val = malloc(sizeof(int)); - if (opt->go_val == NULL) + ptr = malloc(sizeof(int)); + if (ptr == NULL) errx(EXIT_FAILURE, "No memory."); - *(int *)opt->go_val = *val - '0'; + *(int *)ptr = *val - '0'; + opt->go_val = ptr; gctl_ro_param(req, opt->go_name, sizeof(int), opt->go_val); } else { assert(!"Invalid type"); @@ -378,7 +380,7 @@ parse_arguments(struct g_command *cmd, s char val[64]; snprintf(val, sizeof(val), "%jd", - *(intmax_t *)opt->go_val); + *(const intmax_t *)opt->go_val); set_option(cmd, req, opt, val); } } Modified: stable/8/sbin/geom/core/geom.h ============================================================================== --- stable/8/sbin/geom/core/geom.h Sat Oct 23 21:56:50 2010 (r214252) +++ stable/8/sbin/geom/core/geom.h Sat Oct 23 22:04:37 2010 (r214253) @@ -62,7 +62,7 @@ struct g_option { char go_char; const char *go_name; - void *go_val; + const void *go_val; unsigned go_type; };