diff options
author | Jim Meyering <meyering@redhat.com> | 2009-11-20 12:09:42 +0100 |
---|---|---|
committer | Richard Jones <rjones@redhat.com> | 2009-11-20 12:14:14 +0000 |
commit | c372c7c23a298a940b8a0868396ef2ae0d824e4d (patch) | |
tree | 2c6bec16fd926e0bfd357c2623864f19f666decf /test-tool | |
parent | e94f89f40d989d111882178c87b5bfc22314fca8 (diff) | |
download | libguestfs-c372c7c23a298a940b8a0868396ef2ae0d824e4d.tar.gz libguestfs-c372c7c23a298a940b8a0868396ef2ae0d824e4d.tar.xz libguestfs-c372c7c23a298a940b8a0868396ef2ae0d824e4d.zip |
maint: use EXIT_SUCCESS and EXIT_FAILURE, not 0 and 1 to exit
Convert all uses automatically, via these two commands:
git grep -l '\<exit *(1)' \
| grep -vEf .x-sc_prohibit_magic_number_exit \
| xargs --no-run-if-empty \
perl -pi -e 's/\b(exit ?)\(1\)/$1(EXIT_FAILURE)/'
git grep -l '\<exit *(0)' \
| grep -vEf .x-sc_prohibit_magic_number_exit \
| xargs --no-run-if-empty \
perl -pi -e 's/\b(exit ?)\(0\)/$1(EXIT_SUCCESS)/'
* .x-sc_prohibit_magic_number_exit: New file.
Edit (RWMJ): Don't change Java code.
Diffstat (limited to 'test-tool')
-rw-r--r-- | test-tool/helper.c | 14 | ||||
-rw-r--r-- | test-tool/test-tool.c | 58 |
2 files changed, 36 insertions, 36 deletions
diff --git a/test-tool/helper.c b/test-tool/helper.c index 3395f219..731b053e 100644 --- a/test-tool/helper.c +++ b/test-tool/helper.c @@ -42,32 +42,32 @@ main (void) if (mkdir ("/tmp", 0700) == -1) { perror ("mkdir"); fprintf (stderr, "This program should not be run directly. Use libguestfs-test-tool instead.\n"); - exit (1); + exit (EXIT_FAILURE); } if (geteuid () != 0) { fprintf (stderr, "helper: This program doesn't appear to be running as root.\n"); - exit (1); + exit (EXIT_FAILURE); } if (mkdir ("/tmp/helper", 0700) == -1) { perror ("/tmp/helper"); - exit (1); + exit (EXIT_FAILURE); } fd = open ("/tmp/helper/a", O_CREAT|O_EXCL|O_WRONLY, 0600); if (fd == -1) { perror ("create /tmp/helper/a"); - exit (1); + exit (EXIT_FAILURE); } if (write (fd, buffer, sizeof buffer) != sizeof buffer) { perror ("write"); - exit (1); + exit (EXIT_FAILURE); } if (close (fd) == -1) { perror ("close"); - exit (1); + exit (EXIT_FAILURE); } - exit (0); + exit (EXIT_SUCCESS); } diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c index 93aaca20..f38490a7 100644 --- a/test-tool/test-tool.c +++ b/test-tool/test-tool.c @@ -120,7 +120,7 @@ main (int argc, char *argv[]) fprintf (stderr, _("libguestfs-test-tool: unknown long option: %s (%d)\n"), long_options[option_index].name, option_index); - exit (1); + exit (EXIT_FAILURE); } break; @@ -129,19 +129,19 @@ main (int argc, char *argv[]) fprintf (stderr, _("libguestfs-test-tool: invalid timeout: %s\n"), optarg); - exit (1); + exit (EXIT_FAILURE); } break; case '?': usage (); - exit (0); + exit (EXIT_SUCCESS); default: fprintf (stderr, _("libguestfs-test-tool: unexpected command line option 0x%x\n"), c); - exit (1); + exit (EXIT_FAILURE); } } @@ -163,26 +163,26 @@ main (int argc, char *argv[]) if (g == NULL) { fprintf (stderr, _("libguestfs-test-tool: failed to create libguestfs handle\n")); - exit (1); + exit (EXIT_FAILURE); } if (guestfs_add_drive (g, tmpf) == -1) { fprintf (stderr, _("libguestfs-test-tool: failed to add drive '%s'\n"), tmpf); - exit (1); + exit (EXIT_FAILURE); } if (guestfs_add_drive (g, isof) == -1) { fprintf (stderr, _("libguestfs-test-tool: failed to add drive '%s'\n"), isof); - exit (1); + exit (EXIT_FAILURE); } /* Print any version info etc. */ vers = guestfs_version (g); if (vers == NULL) { fprintf (stderr, _("libguestfs-test-tool: guestfs_version failed\n")); - exit (1); + exit (EXIT_FAILURE); } printf ("library version: %"PRIi64".%"PRIi64".%"PRIi64"%s\n", vers->major, vers->minor, vers->release, vers->extra); @@ -204,7 +204,7 @@ main (int argc, char *argv[]) if (guestfs_launch (g) == -1) { fprintf (stderr, _("libguestfs-test-tool: failed to launch appliance\n")); - exit (1); + exit (EXIT_FAILURE); } alarm (0); @@ -216,31 +216,31 @@ main (int argc, char *argv[]) if (guestfs_sfdiskM (g, "/dev/sda", sfdisk_lines) == -1) { fprintf (stderr, _("libguestfs-test-tool: failed to run sfdisk\n")); - exit (1); + exit (EXIT_FAILURE); } if (guestfs_mkfs (g, "ext2", "/dev/sda1") == -1) { fprintf (stderr, _("libguestfs-test-tool: failed to mkfs.ext2\n")); - exit (1); + exit (EXIT_FAILURE); } if (guestfs_mount (g, "/dev/sda1", "/") == -1) { fprintf (stderr, _("libguestfs-test-tool: failed to mount /dev/sda1 on /\n")); - exit (1); + exit (EXIT_FAILURE); } if (guestfs_mkdir (g, "/iso") == -1) { fprintf (stderr, _("libguestfs-test-tool: failed to mkdir /iso\n")); - exit (1); + exit (EXIT_FAILURE); } if (guestfs_mount (g, "/dev/sdb", "/iso") == -1) { fprintf (stderr, _("libguestfs-test-tool: failed to mount /dev/sdb on /iso\n")); - exit (1); + exit (EXIT_FAILURE); } /* Let's now run some simple tests using the helper program. */ @@ -248,12 +248,12 @@ main (int argc, char *argv[]) if (str == NULL) { fprintf (stderr, _("libguestfs-test-tool: could not run helper program, or helper failed\n")); - exit (1); + exit (EXIT_FAILURE); } free (str); printf ("===== TEST FINISHED OK =====\n"); - exit (0); + exit (EXIT_SUCCESS); } static char qemuwrapper[] = "/tmp/libguestfs-test-tool-wrapper-XXXXXX"; @@ -280,7 +280,7 @@ set_qemu (const char *path, int use_wrapper) fprintf (stderr, _("LIBGUESTFS_QEMU environment variable is already set, so\n" "--qemu/--qemudir options cannot be used.\n")); - exit (1); + exit (EXIT_FAILURE); } if (!use_wrapper) { @@ -288,7 +288,7 @@ set_qemu (const char *path, int use_wrapper) fprintf (stderr, _("Binary '%s' does not exist or is not executable\n"), path); - exit (1); + exit (EXIT_FAILURE); } setenv ("LIBGUESTFS_QEMU", path, 1); @@ -302,14 +302,14 @@ set_qemu (const char *path, int use_wrapper) fprintf (stderr, _("%s: does not look like a qemu source directory\n"), path); - exit (1); + exit (EXIT_FAILURE); } /* Make a wrapper script. */ fd = mkstemp (qemuwrapper); if (fd == -1) { perror (qemuwrapper); - exit (1); + exit (EXIT_FAILURE); } fchmod (fd, 0700); @@ -354,19 +354,19 @@ preruncheck (void) "\n" "Use the --helper option to specify the location of this program.\n"), helper); - exit (1); + exit (EXIT_FAILURE); } snprintf (cmd, sizeof cmd, "file '%s'", helper); fp = popen (cmd, "r"); if (fp == NULL) { perror (cmd); - exit (1); + exit (EXIT_FAILURE); } r = fread (buffer, 1, sizeof buffer - 1, fp); if (r == 0) { fprintf (stderr, _("command failed: %s"), cmd); - exit (1); + exit (EXIT_FAILURE); } pclose (fp); buffer[r] = '\0'; @@ -377,7 +377,7 @@ preruncheck (void) "is not statically linked. This is a build error when this test tool\n" "was built.\n"), helper); - exit (1); + exit (EXIT_FAILURE); } } @@ -398,7 +398,7 @@ make_files (void) fd = mkstemp (isof); if (fd == -1) { perror (isof); - exit (1); + exit (EXIT_FAILURE); } close (fd); @@ -408,7 +408,7 @@ make_files (void) if (r == -1 || WEXITSTATUS(r) != 0) { fprintf (stderr, _("mkisofs command failed: %s\n"), cmd); - exit (1); + exit (EXIT_FAILURE); } /* Allocate the sparse file for /dev/sda. */ @@ -416,7 +416,7 @@ make_files (void) if (fd == -1) { perror (tmpf); unlink (isof); - exit (1); + exit (EXIT_FAILURE); } if (lseek (fd, 100 * 1024 * 1024 - 1, SEEK_SET) == -1) { @@ -424,7 +424,7 @@ make_files (void) close (fd); unlink (tmpf); unlink (isof); - exit (1); + exit (EXIT_FAILURE); } if (write (fd, "\0", 1) == -1) { @@ -432,7 +432,7 @@ make_files (void) close (fd); unlink (tmpf); unlink (isof); - exit (1); + exit (EXIT_FAILURE); } close (fd); |