From cd532cb6cda7156d5d6b0219fa5474d0f687122e Mon Sep 17 00:00:00 2001 From: Thomas Richter Date: Wed, 14 Apr 2021 09:54:32 +0200 Subject: [PATCH] cpumf/chcpumf: Replace linux_error by err/warn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace function linux_error() by err/warn functions. Signed-off-by: Thomas Richter Reviewed-by: Sumanth Korikkar Signed-off-by: Jan Höppner --- cpumf/chcpumf.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/cpumf/chcpumf.c b/cpumf/chcpumf.c index de27dda0..f9d97bac 100644 --- a/cpumf/chcpumf.c +++ b/cpumf/chcpumf.c @@ -94,10 +94,8 @@ static int read_sfb(unsigned long *min, unsigned long *max) if (geteuid()) errx(EXIT_FAILURE, "Must run as root"); fp = fopen(PERF_SFB_SIZE, "r"); - if (!fp) { - linux_error(PERF_SFB_SIZE); - return EXIT_FAILURE; - } + if (!fp) + err(EXIT_FAILURE, PERF_SFB_SIZE); if (fscanf(fp, "%ld,%ld", &cur_min_sdb, &cur_max_sdb) != 2) { warnx("Can not parse file " PERF_SFB_SIZE); rc = EXIT_FAILURE; @@ -119,18 +117,16 @@ static int write_sfb(unsigned long min, unsigned long max) FILE *fp; fp = fopen(PERF_SFB_SIZE, "w"); - if (!fp) { - linux_error(PERF_SFB_SIZE); - return EXIT_FAILURE; - } + if (!fp) + err(EXIT_FAILURE, PERF_SFB_SIZE); snprintf(text, sizeof text, "%ld,%ld", min, max); len = strlen(text) + 1; if (fwrite(text, 1, len, fp) != len) { - linux_error(PERF_SFB_SIZE); + warn(PERF_SFB_SIZE); rc = EXIT_FAILURE; } if (fclose(fp)) { - linux_error(PERF_SFB_SIZE); + warn(PERF_SFB_SIZE); rc = EXIT_FAILURE; } if (verbose && rc != EXIT_FAILURE)