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

renice: avoid having same lines of code twice 

Add getprio() function to avoid duplication of a simple task.

Reviewed-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2014-09-05 23:33:16 +01:00
parent 0bb01bb0b7
commit 00b490f002
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys-utils/renice.c
View File

@ -67,8 +67,19 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
}
static int
donice(int which, int who, int prio) {
static int getprio(const int which, const int who, const char *idtype, int *prio)
{
errno = 0;
*prio = getpriority(which, who);
if (*prio == -1 && errno) {
warn(_("failed to get priority for %d (%s)"), who, idtype);
return -errno;
}
return 0;
}
static int donice(int which, int who, int prio)
{
int oldprio, newprio;
const char *idtype = _("process ID");
@ -76,24 +87,14 @@ donice(int which, int who, int prio) {
idtype = _("user ID");
else if (which == PRIO_PGRP)
idtype = _("process group ID");
errno = 0;
oldprio = getpriority(which, who);
if (oldprio == -1 && errno) {
warn(_("failed to get priority for %d (%s)"), who, idtype);
if (getprio(which, who, idtype, &oldprio) != 0)
return 1;
}
if (setpriority(which, who, prio) < 0) {
warn(_("failed to set priority for %d (%s)"), who, idtype);
return 1;
}
errno = 0;
newprio = getpriority(which, who);
if (newprio == -1 && errno) {
warn(_("failed to get priority for %d (%s)"), who, idtype);
if (getprio(which, who, idtype, &newprio) != 0)
return 1;
}
printf(_("%d (%s) old priority %d, new priority %d\n"),
who, idtype, oldprio, newprio);
return 0;
@ -103,8 +104,7 @@ donice(int which, int who, int prio) {
* Change the priority (the nice value) of processes
* or groups of processes which are already running.
*/
int
main(int argc, char **argv)
int main(int argc, char **argv)
{
int which = PRIO_PROCESS;
int who = 0, prio, errs = 0;