From: Guillem Jover <guillem@hadrons.org>
To: util-linux@vger.kernel.org
Subject: Re: [PATCH 04/13] fdisk: drop one parameter from try() function
Date: Thu, 22 Dec 2011 03:24:43 +0100 [thread overview]
Message-ID: <20111222022443.GA31045@gaara.hadrons.org> (raw)
In-Reply-To: <1323975769-21929-4-git-send-email-cosoleto@gmail.com>
Hi!
On Thu, 2011-12-15 at 20:02:40 +0100, Francesco Cosoleto wrote:
> @@ -2800,15 +2800,13 @@ gpt_warning(char *dev)
> }
>
> static void
> -try(char *device, int user_specified) {
> +try(char *device)
> +{
> int gb;
>
> disk_device = device;
> if (setjmp(listingbuf))
> return;
> - if (!user_specified)
> - if (is_ide_cdrom_or_tape(device))
> - return;
> gpt_warning(device);
> if ((fd = open(disk_device, type_open)) >= 0) {
> gb = get_boot(try_only);
> @@ -2859,7 +2857,7 @@ tryprocpt(void) {
> if (is_whole_disk(devname)) {
> char *cn = canonicalize_path(devname);
> if (cn) {
> - try(cn, 0);
> + try(cn);
> free(cn);
> }
> }
> @@ -3079,7 +3077,8 @@ main(int argc, char **argv) {
> dummy(&k);
> listing = 1;
> for (k = optind; k < argc; k++)
> - try(argv[k], 1);
> + if (!is_ide_cdrom_or_tape(argv[k]))
> + try(argv[k]);
> } else {
> /* we no longer have default device names */
> /* but we can use /proc/partitions instead */
The logic on user_specified is inverted so it seems the checks on the
call sites would need to be swapped?
regards,
guillem
next prev parent reply other threads:[~2011-12-22 2:30 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-15 19:02 [PATCH 01/13] fdisk: remove unused 'require' member in enum action Francesco Cosoleto
2011-12-15 19:02 ` [PATCH 02/13] fdisk: remove possibly_osf_label variable that is only assigned Francesco Cosoleto
2011-12-15 19:02 ` [PATCH 03/13] fdisk: move code for renaming SGI bootfile to SGI module Francesco Cosoleto
2011-12-15 19:02 ` [PATCH 04/13] fdisk: drop one parameter from try() function Francesco Cosoleto
2011-12-16 13:18 ` Karel Zak
2011-12-22 2:24 ` Guillem Jover [this message]
2011-12-22 15:26 ` Francesco Cosoleto
2012-01-04 13:36 ` Karel Zak
2011-12-15 19:02 ` [PATCH 05/13] fdisk: rename try() and tryprocpt() functions Francesco Cosoleto
2011-12-15 19:02 ` [PATCH 06/13] fdisk: get rid of type_open global variable Francesco Cosoleto
2011-12-15 19:02 ` [PATCH 07/13] fdisk: get rid of get_boot(create_empty_sun) call Francesco Cosoleto
2011-12-15 19:02 ` [PATCH 08/13] fdisk: remove unused guess_device_type() function Francesco Cosoleto
2011-12-15 19:02 ` [PATCH 09/13] fdisk: don't use get_existing_partition() if disk label isn't dos Francesco Cosoleto
2011-12-15 19:02 ` [PATCH 10/13] fdisk: avoid an intermediate variable in command_prompt() Francesco Cosoleto
2011-12-15 19:02 ` [PATCH 11/13] fdisk: Fix bad invalid flag 0x00000 warning message Francesco Cosoleto
2011-12-15 19:02 ` [PATCH 12/13] fdisk: improve some messages Francesco Cosoleto
2011-12-15 19:02 ` [PATCH 13/13] tests: update fdisk tests Francesco Cosoleto
2011-12-16 13:12 ` [PATCH 01/13] fdisk: remove unused 'require' member in enum action Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111222022443.GA31045@gaara.hadrons.org \
--to=guillem@hadrons.org \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).