From owner-svn-src-user@FreeBSD.ORG Fri Oct 22 19:18:49 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97C24106566B; Fri, 22 Oct 2010 19:18:49 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 500D28FC0A; Fri, 22 Oct 2010 19:18:49 +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 o9MJInGE063405; Fri, 22 Oct 2010 19:18:49 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9MJInK4063403; Fri, 22 Oct 2010 19:18:49 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201010221918.o9MJInK4063403@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Fri, 22 Oct 2010 19:18:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r214218 - user/ae/usr.sbin/sade X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Oct 2010 19:18:50 -0000 Author: ae Date: Fri Oct 22 19:18:48 2010 New Revision: 214218 URL: http://svn.freebsd.org/changeset/base/214218 Log: Update yet another argument that should be replaced to arg0. Since G_TYPE_ASCNUM was removed in r212614 some of arguments in gctl request should be updated too. Modified: user/ae/usr.sbin/sade/parts.c Modified: user/ae/usr.sbin/sade/parts.c ============================================================================== --- user/ae/usr.sbin/sade/parts.c Fri Oct 22 18:33:39 2010 (r214217) +++ user/ae/usr.sbin/sade/parts.c Fri Oct 22 19:18:48 2010 (r214218) @@ -245,7 +245,7 @@ de_dev_scheme_create(struct de_device *p gctl_ro_param(req, "verb", -1, "create"); gctl_ro_param(req, "class", -1, class_name); gctl_ro_param(req, "scheme", -1, scheme); - gctl_ro_param(req, "provider", -1, pdev->de_name); + gctl_ro_param(req, arg0_name, -1, pdev->de_name); gctl_ro_param(req, "flags", -1, sade_flags); error = de_gpart_issue(req); @@ -528,10 +528,10 @@ int de_part_add(struct de_device *pdev, const char *type, off_t start, off_t size, const char* label, int idx) { - int error; struct gctl_req *req; - char *sindex = NULL; char *sstart = NULL, *ssize = NULL; + intmax_t index; + int error; assert(pdev != NULL); assert(pdev->de_name != NULL); @@ -545,11 +545,6 @@ de_part_add(struct de_device *pdev, cons if (error) return (error); } - if (idx > 0) { - asprintf(&sindex, "%d", idx); - if (sindex == NULL) - return (ENOMEM); - } error = ENOMEM; asprintf(&sstart, "%jd", (intmax_t)start); if (sstart == NULL) @@ -568,15 +563,16 @@ de_part_add(struct de_device *pdev, cons gctl_ro_param(req, "start", -1, sstart); gctl_ro_param(req, "size", -1, ssize); gctl_ro_param(req, "flags", -1, sade_flags); - if (idx > 0) - gctl_ro_param(req, "index", -1, sindex); + if (idx > 0) { + index = (intmax_t)idx; + gctl_ro_param(req, "index", sizeof(index), &index); + } if (label) gctl_ro_param(req, "label", -1, label); error = de_gpart_issue(req); gctl_free(req); fail: - free(sindex); free(sstart); free(ssize); return (error); @@ -585,68 +581,60 @@ fail: int de_part_del(struct de_device *pdev, int idx) { - int error; struct gctl_req *req; - char *sindex; + intmax_t index; + int error; assert(pdev != NULL); assert(pdev->de_name != NULL); if (idx <= 0) return (EINVAL); - asprintf(&sindex, "%d", idx); - if (sindex == NULL) - return (ENOMEM); + index = (intmax_t)idx; req = gctl_get_handle(); if (req == NULL) - goto fail; + return (ENOMEM); gctl_ro_param(req, "verb", -1, "delete"); gctl_ro_param(req, "class", -1, class_name); gctl_ro_param(req, arg0_name, -1, pdev->de_name); - gctl_ro_param(req, "index", -1, sindex); + gctl_ro_param(req, "index", sizeof(index), &index); gctl_ro_param(req, "flags", -1, sade_flags); error = de_gpart_issue(req); gctl_free(req); -fail: - free(sindex); return (error); } static int de_part_attr(struct de_device *pdev, int act, const char *name, int idx) { - int error; struct gctl_req *req; const char *cmdstr = act ? "set": "unset"; - char *sindex; + intmax_t index; + int error; assert(pdev != NULL); assert(pdev->de_name != NULL); if (idx <= 0) return (EINVAL); - asprintf(&sindex, "%d", idx); - if (sindex == NULL) - return (ENOMEM); + index = (intmax_t)idx; req = gctl_get_handle(); if (req == NULL) - goto fail; + return (ENOMEM); gctl_ro_param(req, "verb", -1, cmdstr); gctl_ro_param(req, "class", -1, class_name); gctl_ro_param(req, arg0_name, -1, pdev->de_name); gctl_ro_param(req, "attrib", -1, name); - gctl_ro_param(req, "index", -1, sindex); + gctl_ro_param(req, "index", sizeof(index), &index); gctl_ro_param(req, "flags", -1, sade_flags); error = de_gpart_issue(req); gctl_free(req); -fail: - free(sindex); return (error); } @@ -666,9 +654,9 @@ int de_part_mod(struct de_device *pdev, const char *type, const char *label, int idx) { - int error; struct gctl_req *req; - char *sindex = NULL; + intmax_t index; + int error; assert(pdev != NULL); assert(pdev->de_name != NULL); @@ -677,18 +665,16 @@ de_part_mod(struct de_device *pdev, cons return (EINVAL); if (type == NULL && label == NULL) return (EINVAL); - asprintf(&sindex, "%d", idx); - if (sindex == NULL) - return (ENOMEM); + index = (intmax_t)idx; req = gctl_get_handle(); if (req == NULL) - goto fail; + return (ENOMEM); gctl_ro_param(req, "verb", -1, "modify"); gctl_ro_param(req, "class", -1, class_name); gctl_ro_param(req, arg0_name, -1, pdev->de_name); - gctl_ro_param(req, "index", -1, sindex); + gctl_ro_param(req, "index", sizeof(index), &index); gctl_ro_param(req, "flags", -1, sade_flags); if (label) gctl_ro_param(req, "label", -1, label); @@ -697,8 +683,6 @@ de_part_mod(struct de_device *pdev, cons error = de_gpart_issue(req); gctl_free(req); -fail: - free(sindex); return (error); }