diff options
| author | Karel Zak | 2006-12-07 00:26:05 +0100 |
|---|---|---|
| committer | Karel Zak | 2006-12-07 00:26:05 +0100 |
| commit | 95f1bdeee42cd7b9ac49d64b27bcec49557a991e (patch) | |
| tree | 5813d335771188c724c3d1bc9f9f9feb23c1d9ca /disk-utils/mkfs.minix.c | |
| parent | Imported from util-linux-2.11w tarball. (diff) | |
| download | kernel-qcow2-util-linux-95f1bdeee42cd7b9ac49d64b27bcec49557a991e.tar.gz kernel-qcow2-util-linux-95f1bdeee42cd7b9ac49d64b27bcec49557a991e.tar.xz kernel-qcow2-util-linux-95f1bdeee42cd7b9ac49d64b27bcec49557a991e.zip | |
Imported from util-linux-2.11x tarball.
Diffstat (limited to 'disk-utils/mkfs.minix.c')
| -rw-r--r-- | disk-utils/mkfs.minix.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c index b56b095f5..f399684af 100644 --- a/disk-utils/mkfs.minix.c +++ b/disk-utils/mkfs.minix.c @@ -160,17 +160,11 @@ static unsigned long req_nr_inodes = 0; #define mark_zone(x) (setbit(zone_map,(x)-FIRSTZONE+1)) #define unmark_zone(x) (clrbit(zone_map,(x)-FIRSTZONE+1)) -#ifndef HAVE_MINIX2 -static void -fatal_error(const char * fmt_string,int status) { - fprintf(stderr,fmt_string,program_name,device_name); - exit(status); -} -#endif - static void die(char *str) { - fprintf(stderr, "%s: %s\n", program_name, str); + fprintf(stderr, "%s: ", program_name); + fprintf(stderr, str, device_name); + fprintf(stderr, "\n"); exit(8); } @@ -675,11 +669,13 @@ main(int argc, char ** argv) { dirsize = i+2; break; case 'v': -#ifdef HAVE_MINIX2 - version2 = 1; -#else - fatal_error(_("%s: not compiled with minix v2 support\n"),-1); +#ifndef HAVE_MINIX2 + fprintf(stderr, + _("%s: not compiled with minix v2 support\n"), + program_name); + exit(-1); #endif + version2 = 1; break; default: usage(); |