From owner-svn-src-user@FreeBSD.ORG Fri Oct 22 18:33:39 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 7AFCF1065670; Fri, 22 Oct 2010 18:33:39 +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 6A9708FC08; Fri, 22 Oct 2010 18:33:39 +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 o9MIXdqD062516; Fri, 22 Oct 2010 18:33:39 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9MIXdBU062513; Fri, 22 Oct 2010 18:33:39 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201010221833.o9MIXdBU062513@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Fri, 22 Oct 2010 18:33:39 +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: r214217 - 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 18:33:39 -0000 Author: ae Date: Fri Oct 22 18:33:39 2010 New Revision: 214217 URL: http://svn.freebsd.org/changeset/base/214217 Log: In r212554 argument name was changed from "geom" to "arg0". Sync libgeom related code with head/ and replace "geom" with "arg0" too. Add sys/types.h to fix build. Modified: user/ae/usr.sbin/sade/customdlg.c user/ae/usr.sbin/sade/parts.c Modified: user/ae/usr.sbin/sade/customdlg.c ============================================================================== --- user/ae/usr.sbin/sade/customdlg.c Fri Oct 22 18:31:44 2010 (r214216) +++ user/ae/usr.sbin/sade/customdlg.c Fri Oct 22 18:33:39 2010 (r214217) @@ -27,6 +27,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include Modified: user/ae/usr.sbin/sade/parts.c ============================================================================== --- user/ae/usr.sbin/sade/parts.c Fri Oct 22 18:31:44 2010 (r214216) +++ user/ae/usr.sbin/sade/parts.c Fri Oct 22 18:33:39 2010 (r214217) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); static const char *class_name = "PART"; static const char *sade_flags = "sade"; +static const char *arg0_name = "arg0"; static char de_errstr[BUFSIZ]; char* @@ -267,7 +268,7 @@ de_dev_scheme_destroy(struct de_device * gctl_ro_param(req, "verb", -1, "destroy"); gctl_ro_param(req, "class", -1, class_name); - gctl_ro_param(req, "geom", -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); @@ -351,7 +352,7 @@ de_dev_bootcode(struct de_device *pdev, gctl_ro_param(req, "verb", -1, "bootcode"); gctl_ro_param(req, "class", -1, class_name); - gctl_ro_param(req, "geom", -1, pdev->de_name); + gctl_ro_param(req, arg0_name, -1, pdev->de_name); gctl_ro_param(req, "bootcode", size, code); gctl_ro_param(req, "flags", -1, sade_flags); @@ -377,7 +378,7 @@ de_dev_undo(struct de_device *pdev) gctl_ro_param(req, "verb", -1, "undo"); gctl_ro_param(req, "class", -1, class_name); - gctl_ro_param(req, "geom", -1, pdev->de_name); + gctl_ro_param(req, arg0_name, -1, pdev->de_name); error = de_gpart_issue(req); gctl_free(req); @@ -399,7 +400,7 @@ de_dev_commit(struct de_device *pdev) gctl_ro_param(req, "verb", -1, "commit"); gctl_ro_param(req, "class", -1, class_name); - gctl_ro_param(req, "geom", -1, pdev->de_name); + gctl_ro_param(req, arg0_name, -1, pdev->de_name); error = de_gpart_issue(req); gctl_free(req); @@ -562,7 +563,7 @@ de_part_add(struct de_device *pdev, cons gctl_ro_param(req, "verb", -1, "add"); gctl_ro_param(req, "class", -1, class_name); - gctl_ro_param(req, "geom", -1, pdev->de_name); + gctl_ro_param(req, arg0_name, -1, pdev->de_name); gctl_ro_param(req, "type", -1, type); gctl_ro_param(req, "start", -1, sstart); gctl_ro_param(req, "size", -1, ssize); @@ -603,7 +604,7 @@ de_part_del(struct de_device *pdev, int gctl_ro_param(req, "verb", -1, "delete"); gctl_ro_param(req, "class", -1, class_name); - gctl_ro_param(req, "geom", -1, pdev->de_name); + gctl_ro_param(req, arg0_name, -1, pdev->de_name); gctl_ro_param(req, "index", -1, sindex); gctl_ro_param(req, "flags", -1, sade_flags); @@ -637,7 +638,7 @@ de_part_attr(struct de_device *pdev, int gctl_ro_param(req, "verb", -1, cmdstr); gctl_ro_param(req, "class", -1, class_name); - gctl_ro_param(req, "geom", -1, pdev->de_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, "flags", -1, sade_flags); @@ -686,7 +687,7 @@ de_part_mod(struct de_device *pdev, cons gctl_ro_param(req, "verb", -1, "modify"); gctl_ro_param(req, "class", -1, class_name); - gctl_ro_param(req, "geom", -1, pdev->de_name); + gctl_ro_param(req, arg0_name, -1, pdev->de_name); gctl_ro_param(req, "index", -1, sindex); gctl_ro_param(req, "flags", -1, sade_flags); if (label) @@ -785,7 +786,7 @@ de_part_resize(struct de_device *pdev, c gctl_ro_param(req, "class", -1, class_name); gctl_ro_param(req, "verb", -1, "resize"); - gctl_ro_param(req, "geom", -1, pdev->de_name); + gctl_ro_param(req, arg0_name, -1, pdev->de_name); gctl_ro_param(req, "size", -1, size); gctl_ro_param(req, "index", -1, sindex); gctl_ro_param(req, "flags", -1, sade_flags);