summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbluhm <bluhm@openbsd.org>2018-06-01 19:21:33 +0000
committerbluhm <bluhm@openbsd.org>2018-06-01 19:21:33 +0000
commitc1a2d5c1cfac363aa247f7844b75971fdedf36f3 (patch)
tree5fe71a895435d631afd52c31a5752345de37c012
parentClear aesni_sc if the context is freed, to avoid leaving a dangling (diff)
downloadwireguard-openbsd-c1a2d5c1cfac363aa247f7844b75971fdedf36f3.tar.xz
wireguard-openbsd-c1a2d5c1cfac363aa247f7844b75971fdedf36f3.zip
Avoid some unnecessary calls to strlen(3) in systat uvm.
OK krw@
-rw-r--r--usr.bin/systat/uvm.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.bin/systat/uvm.c b/usr.bin/systat/uvm.c
index fcaa79c7ce1..f25732727a4 100644
--- a/usr.bin/systat/uvm.c
+++ b/usr.bin/systat/uvm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm.c,v 1.1 2018/05/30 13:43:51 krw Exp $ */
+/* $OpenBSD: uvm.c,v 1.2 2018/06/01 19:21:33 bluhm Exp $ */
/*
* Copyright (c) 2008 Can Erkin Acar <canacar@openbsd.org>
* Copyright (c) 2018 Kenneth R Westerback <krw@openbsd.org>
@@ -238,7 +238,7 @@ print_uvmexp_field(field_def *fvalue, field_def *fname, int *new, int *old,
const char *name)
{
char *uppername;
- size_t i;
+ size_t len, i;
if (new == NULL && name == NULL)
return;
@@ -255,11 +255,13 @@ print_uvmexp_field(field_def *fvalue, field_def *fname, int *new, int *old,
print_fld_str(fname, name);
return;
}
- uppername = calloc(1, strlen(name) + 1);
+ len = strlen(name);
+ uppername = malloc(len + 1);
if (uppername == NULL)
- err(1, "calloc");
- for (i = 0; i < strlen(name); i++)
+ err(1, "malloc");
+ for (i = 0; i < len; i++)
uppername[i] = toupper(name[i]);
+ uppername[len] = '\0';
print_fld_str(fname, uppername);
free(uppername);
}