Joel Granados Moreno <[email protected]> writes: > * libparted/labels/dasd.c (dasd_probe) : Inform the user when no dasd > volumes are present in a device. > --- > libparted/labels/dasd.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libparted/labels/dasd.c b/libparted/labels/dasd.c > index 9edab40..dfdd59c 100644 > --- a/libparted/labels/dasd.c > +++ b/libparted/labels/dasd.c > @@ -213,7 +213,6 @@ ped_disk_dasd_done () > static int > dasd_probe (const PedDevice *dev) > { > - char *errstr = 0; > LinuxSpecific* arch_specific; > struct fdasd_anchor anchor; > > @@ -240,7 +239,8 @@ dasd_probe (const PedDevice *dev) > > error_cleanup: > fdasd_cleanup(&anchor); > - > ped_exception_throw(PED_EXCEPTION_ERROR,PED_EXCEPTION_IGNORE_CANCEL,errstr); > + ped_exception_throw(PED_EXCEPTION_ERROR,PED_EXCEPTION_IGNORE_CANCEL, > + "Error while probing device %s.", dev->name); > > return 0; > }
Thanks. I've pushed this. Minor changes: adjusted log message updated copyright year corrected indentation >From 1b89f3de691b441e5e4e354b6232fc74d1ec5b0c Mon Sep 17 00:00:00 2001 From: Joel Granados Moreno <[email protected]> Date: Thu, 19 Feb 2009 16:53:12 +0100 Subject: [PATCH] dasd: emit a diagnostic upon probe failure * libparted/labels/dasd.c (dasd_probe): Inform the user when no dasd volumes are present in a device. --- libparted/labels/dasd.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libparted/labels/dasd.c b/libparted/labels/dasd.c index 9edab40..b1cd937 100644 --- a/libparted/labels/dasd.c +++ b/libparted/labels/dasd.c @@ -1,7 +1,7 @@ /* -*- Mode: c; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- libparted - a library for manipulating disk partitions - Copyright (C) 2000, 2001, 2007-2008 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2007-2009 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -213,7 +213,6 @@ ped_disk_dasd_done () static int dasd_probe (const PedDevice *dev) { - char *errstr = 0; LinuxSpecific* arch_specific; struct fdasd_anchor anchor; @@ -238,9 +237,10 @@ dasd_probe (const PedDevice *dev) return 1; -error_cleanup: + error_cleanup: fdasd_cleanup(&anchor); - ped_exception_throw(PED_EXCEPTION_ERROR,PED_EXCEPTION_IGNORE_CANCEL,errstr); + ped_exception_throw(PED_EXCEPTION_ERROR,PED_EXCEPTION_IGNORE_CANCEL, + "Error while probing device %s.", dev->name); return 0; } -- 1.6.2.rc1.241.g7bf82 _______________________________________________ parted-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/parted-devel
