mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use 'error' function for fprintf followed by exit.

Browse Source 
Like with the previous commit, this replaces instances of:

  if (something_bad) {
    fprintf (stderr, "%s: error message\n", guestfs_int_program_name);
    exit (EXIT_FAILURE);
  }

with:

  if (something_bad)
    error (EXIT_FAILURE, 0, "error message");

(except in a few cases were errno was incorrectly being ignored, in
which case I have fixed that).

It's slightly more complex than the previous commit because we must be
careful to:

 - Remove the program name (since error(3) prints it).

 - Remove any trailing \n character from the message.

Candidates for replacement were found using:

  pcregrep --buffer-size 10M -M '\bfprintf\b.*\n.*\bexit\b' `git ls-files`
This commit is contained in:
Richard W.M. Jones
2016-04-04 11:31:00 +01:00
parent 129e4938ba
commit fdfedcb4ef
51 changed files with 574 additions and 1004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
rescue/rescue.c
View File

@@ -133,10 +133,8 @@ main (int argc, char *argv[])
int suggest = 0;
g = guestfs_create ();
if (g == NULL) {
fprintf (stderr, _("guestfs_create: failed to create handle\n"));
exit (EXIT_FAILURE);
}
if (g == NULL)
error (EXIT_FAILURE, errno, "guestfs_create");
for (;;) {
c = getopt_long (argc, argv, options, long_options, &option_index);
@@ -158,16 +156,12 @@ main (int argc, char *argv[])
} else if (STREQ (long_options[option_index].name, "format")) {
OPTION_format;
} else if (STREQ (long_options[option_index].name, "smp")) {
if (sscanf (optarg, "%d", &smp) != 1) {
fprintf (stderr, _("%s: could not parse --smp parameter '%s'\n"),
guestfs_int_program_name, optarg);
exit (EXIT_FAILURE);
}
if (smp < 1) {
fprintf (stderr, _("%s: --smp parameter '%s' should be >= 1\n"),
guestfs_int_program_name, optarg);
exit (EXIT_FAILURE);
}
if (sscanf (optarg, "%d", &smp) != 1)
error (EXIT_FAILURE, 0,
_("could not parse --smp parameter '%s'"), optarg);
if (smp < 1)
error (EXIT_FAILURE, 0,
_("--smp parameter '%s' should be >= 1"), optarg);
} else if (STREQ (long_options[option_index].name, "suggest")) {
suggest = 1;
} else if (STREQ (long_options[option_index].name, "scratch")) {
@@ -175,25 +169,18 @@ main (int argc, char *argv[])
add_scratch_disks (1, &drvs);
else {
int n;
if (sscanf (optarg, "%d", &n) != 1) {
fprintf (stderr,
_("%s: could not parse --scratch parameter '%s'\n"),
guestfs_int_program_name, optarg);
exit (EXIT_FAILURE);
}
if (n < 1) {
fprintf (stderr,
_("%s: --scratch parameter '%s' should be >= 1\n"),
guestfs_int_program_name, optarg);
exit (EXIT_FAILURE);
}
if (sscanf (optarg, "%d", &n) != 1)
error (EXIT_FAILURE, 0,
_("could not parse --scratch parameter '%s'"), optarg);
if (n < 1)
error (EXIT_FAILURE, 0,
_("--scratch parameter '%s' should be >= 1"), optarg);
add_scratch_disks (n, &drvs);
}
} else {
fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),
guestfs_int_program_name, long_options[option_index].name, option_index);
exit (EXIT_FAILURE);
}
} else
error (EXIT_FAILURE, 0,
_("unknown long option: %s (%d)"),
long_options[option_index].name, option_index);
break;
case 'a':
@@ -209,11 +196,9 @@ main (int argc, char *argv[])
break;
case 'm':
if (sscanf (optarg, "%d", &memsize) != 1) {
fprintf (stderr, _("%s: could not parse memory size '%s'\n"),
guestfs_int_program_name, optarg);
exit (EXIT_FAILURE);
}
if (sscanf (optarg, "%d", &memsize) != 1)
error (EXIT_FAILURE, 0,
_("could not parse memory size '%s'"), optarg);
break;
case 'r':