diff options
author | Sami Kerola <kerolasa@iki.fi> | 2011-10-12 20:53:11 +0200 |
---|---|---|
committer | Sami Kerola <kerolasa@iki.fi> | 2011-12-20 17:30:50 +0100 |
commit | f70cdd0666bd77dccac5cbf48431c95ed155fa72 (patch) | |
tree | 3e8dd386cb72f3685555152cf61e691c8c6f977c | |
parent | 4bfc4a00fbe4ce68cf19ce89f6ebee84950ac233 (diff) | |
download | procps-ng-f70cdd0666bd77dccac5cbf48431c95ed155fa72.tar.gz |
vmstat: use libc error printing facilities
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
-rw-r--r-- | vmstat.c | 17 |
1 files changed, 6 insertions, 11 deletions
@@ -291,10 +291,8 @@ static int diskpartition_format(const char* partition_name){ const char format[] = "%20u %10llu %10u %10llu\n"; fDiskstat=fopen("/proc/diskstats","rb"); - if(!fDiskstat){ - fprintf(stderr, _("Your kernel doesn't support diskstat. (2.5.70 or above required)\n")); - exit(EXIT_FAILURE); - } + if(!fDiskstat) + errx(EXIT_FAILURE, _("Your kernel doesn't support diskstat. (2.5.70 or above required)")); fclose(fDiskstat); ndisks=getdiskstat(&disks,&partitions); @@ -406,10 +404,8 @@ static void diskformat(void){ free(disks); free(partitions); } - }else{ - fprintf(stderr, _("Your kernel doesn't support diskstat (2.5.70 or above required)\n")); - exit(EXIT_FAILURE); - } + }else + errx(EXIT_FAILURE, _("Your kernel doesn't support diskstat (2.5.70 or above required)")); } //////////////////////////////////////////////////////////////////////////// @@ -428,7 +424,7 @@ static void slabformat (void){ fSlab=fopen("/proc/slabinfo", "rb"); if(!fSlab){ - fprintf(stderr, _("Your kernel doesn't support slabinfo or your permissions are insufficient.\n")); + warnx(_("Your kernel doesn't support slabinfo or your permissions are insufficient.")); return; } @@ -650,8 +646,7 @@ int main(int argc, char *argv[]) { case 'm': dataUnit = UNIT_m; break; case 'M': dataUnit = UNIT_M; break; default: - fprintf(stderr, _("-S requires k, K, m or M (default is kb)\n")); - exit(EXIT_FAILURE); + errx(EXIT_FAILURE, _("-S requires k, K, m or M (default is kb)")); } szDataUnit[0] = optarg[0]; break; |