From owner-svn-src-all@FreeBSD.ORG Wed Jan 14 21:08:20 2009 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 6B2EA106564A; Wed, 14 Jan 2009 21:08:20 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3D5BD8FC08; Wed, 14 Jan 2009 21:08:20 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0EL8JTV053968; Wed, 14 Jan 2009 21:08:19 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0EL8JYF053967; Wed, 14 Jan 2009 21:08:19 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <200901142108.n0EL8JYF053967@svn.freebsd.org> From: Luigi Rizzo Date: Wed, 14 Jan 2009 21:08:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187241 - head/sbin/fdisk 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: Wed, 14 Jan 2009 21:08:20 -0000 Author: luigi Date: Wed Jan 14 21:08:19 2009 New Revision: 187241 URL: http://svn.freebsd.org/changeset/base/187241 Log: more changes from Christoph: pass a pointer instead of an index to print_part() so it does not depend on a static variable. Submitted by: Christoph Mallon MFC after: 3 days Modified: head/sbin/fdisk/fdisk.c Modified: head/sbin/fdisk/fdisk.c ============================================================================== --- head/sbin/fdisk/fdisk.c Wed Jan 14 21:04:23 2009 (r187240) +++ head/sbin/fdisk/fdisk.c Wed Jan 14 21:08:19 2009 (r187241) @@ -217,7 +217,7 @@ static struct part_type }; static void print_s0(void); -static void print_part(int i); +static void print_part(const struct dos_partition *); static void init_sector0(unsigned long start); static void init_boot(void); static void change_part(int i); @@ -445,20 +445,19 @@ print_s0(void) print_params(); printf("Information from DOS bootblock is:\n"); - for (i = 1; i <= NDOSPART; i++) - printf("%d: ", i), print_part(i); + for (i = 1; i <= NDOSPART; i++) { + printf("%d: ", i); + print_part(&mboot.parts[i - 1]); + } } static struct dos_partition mtpart; static void -print_part(int i) +print_part(const struct dos_partition *partp) { - struct dos_partition *partp; u_int64_t part_mb; - partp = &mboot.parts[i - 1]; - if (!bcmp(partp, &mtpart, sizeof (struct dos_partition))) { printf("\n"); return; @@ -546,18 +545,18 @@ change_part(int i) struct dos_partition *partp = &mboot.parts[i - 1]; printf("The data for partition %d is:\n", i); - print_part(i); + print_part(partp); if (u_flag && ok("Do you want to change it?")) { int tmp; if (i_flag) { - bzero(partp, sizeof (*partp)); - if (i == 1) { - init_sector0(1); - printf("\nThe static data for the slice 1 has been reinitialized to:\n"); - print_part(i); - } + bzero(partp, sizeof (*partp)); + if (i == 1) { + init_sector0(1); + printf("\nThe static data for the slice 1 has been reinitialized to:\n"); + print_part(partp); + } } do { @@ -594,7 +593,7 @@ change_part(int i) } else dos(partp); - print_part(i); + print_part(partp); } while (!ok("Are we happy with this entry?")); } }