diff options
| author | Matthias Koenig | 2007-08-27 16:49:19 +0200 |
|---|---|---|
| committer | Karel Zak | 2007-08-27 23:58:05 +0200 |
| commit | 2b25841371cf56f54fbbb88cd0b524dad034cc30 (patch) | |
| tree | 7ec3c9166dae2eb1b4e62b0ca34320c56fa75add /schedutils/ionice.c | |
| parent | cytune: make the oneliner more specific the cyclades hw in question (diff) | |
| download | kernel-qcow2-util-linux-2b25841371cf56f54fbbb88cd0b524dad034cc30.tar.gz kernel-qcow2-util-linux-2b25841371cf56f54fbbb88cd0b524dad034cc30.tar.xz kernel-qcow2-util-linux-2b25841371cf56f54fbbb88cd0b524dad034cc30.zip | |
ionice: clean up error handling
Print error in case execvp fails and use exit macros.
Based on patch by Bernhard Voelker <mail@bernhard-voelker.de>
Signed-off-by: Matthias Koenig <mkoenig@suse.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'schedutils/ionice.c')
| -rw-r--r-- | schedutils/ionice.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/schedutils/ionice.c b/schedutils/ionice.c index 2d23dd0e7..9eb13877b 100644 --- a/schedutils/ionice.c +++ b/schedutils/ionice.c @@ -107,7 +107,7 @@ int main(int argc, char *argv[]) case 'h': default: usage(); - exit(0); + exit(EXIT_SUCCESS); } } @@ -125,7 +125,7 @@ int main(int argc, char *argv[]) break; default: printf("bad prio class %d\n", ioprio_class); - return 1; + exit(EXIT_FAILURE); } if (!set) { @@ -134,9 +134,10 @@ int main(int argc, char *argv[]) ioprio = ioprio_get(IOPRIO_WHO_PROCESS, pid); - if (ioprio == -1) + if (ioprio == -1) { perror("ioprio_get"); - else { + exit(EXIT_FAILURE); + } else { ioprio_class = ioprio >> IOPRIO_CLASS_SHIFT; if (ioprio_class != IOPRIO_CLASS_IDLE) { ioprio = ioprio & 0xff; @@ -147,12 +148,16 @@ int main(int argc, char *argv[]) } else { if (ioprio_set(IOPRIO_WHO_PROCESS, pid, ioprio | ioprio_class << IOPRIO_CLASS_SHIFT) == -1) { perror("ioprio_set"); - return 1; + exit(EXIT_FAILURE); } - if (argv[optind]) + if (argv[optind]) { execvp(argv[optind], &argv[optind]); + /* execvp should never return */ + perror("execvp"); + exit(EXIT_FAILURE); + } } - return 0; + exit(EXIT_SUCCESS); } |