ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

swapoff: cleanup usage() and includes 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2012-04-18 12:38:03 +02:00
parent d5360e9250
commit 7cf6a65476
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sys-utils/swapoff.c
View File

@ -1,16 +1,6 @@
#include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <getopt.h>
#include <string.h>
#include <mntent.h>
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <getopt.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <fcntl.h>
#include <stdint.h>
#include <ctype.h>
#ifdef HAVE_SYS_SWAP_H #ifdef HAVE_SYS_SWAP_H
# include <sys/swap.h> # include <sys/swap.h>
@ -71,16 +61,19 @@ static int swapoff_by_uuid(const char *uuid, int quiet)
return special ? do_swapoff(special, quiet, CANONIC) : cannot_find(uuid); return special ? do_swapoff(special, quiet, CANONIC) : cannot_find(uuid);
} }
static void usage(FILE *out, int n) static void __attribute__ ((__noreturn__)) usage(FILE * out)
{ {
fputs(_("\nUsage:\n"), out); fputs(USAGE_HEADER, out);
fprintf(out, _(" %s [options] [<spec>]\n"), program_invocation_short_name); fprintf(out, _(" %s [options] [<spec>]\n"), program_invocation_short_name);
fputs(_("\nOptions:\n"), out); fputs(USAGE_OPTIONS, out);
fputs(_(" -a, --all disable all swaps from /proc/swaps\n" fputs(_(" -a, --all disable all swaps from /proc/swaps\n"
" -h, --help display help and exit\n" " -v, --verbose verbose mode\n"), out);
" -v, --verbose verbose mode\n"
" -V, --version display version and exit\n"), out); fputs(USAGE_SEPARATOR, out);
fputs(USAGE_HELP, out);
fputs(USAGE_VERSION, out);
fputs(_("\nThe <spec> parameter:\n" \ fputs(_("\nThe <spec> parameter:\n" \
" -L <label> LABEL of device to be used\n" \ " -L <label> LABEL of device to be used\n" \
@ -88,8 +81,10 @@ static void usage(FILE *out, int n)
" LABEL=<label> LABEL of device to be used\n" \ " LABEL=<label> LABEL of device to be used\n" \
" UUID=<uuid> UUID of device to be used\n" \ " UUID=<uuid> UUID of device to be used\n" \
" <device> name of device to be used\n" \ " <device> name of device to be used\n" \
" <file> name of file to be used\n\n"), out); " <file> name of file to be used\n"), out);
exit(n);
fprintf(out, USAGE_MAN_TAIL("swapoff(8)"));
exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
} }
static int swapoff_all(void) static int swapoff_all(void)
@ -155,7 +150,7 @@ int main(int argc, char *argv[])
++all; ++all;
break; break;
case 'h': /* help */ case 'h': /* help */
usage(stdout, 0); usage(stdout);
break; break;
case 'v': /* be chatty */ case 'v': /* be chatty */
++verbose; ++verbose;
@ -169,17 +164,15 @@ int main(int argc, char *argv[])
case 'U': case 'U':
add_uuid(optarg); add_uuid(optarg);
break; break;
case 0:
break;
case '?': case '?':
default: default:
usage(stderr, 1); usage(stderr);
} }
} }
argv += optind; argv += optind;
if (!all && !numof_labels() && !numof_uuids() && *argv == NULL) if (!all && !numof_labels() && !numof_uuids() && *argv == NULL)
usage(stderr, 2); usage(stderr);
mnt_init_debug(0); mnt_init_debug(0);
mntcache = mnt_new_cache(); mntcache = mnt_new_cache();