summaryrefslogtreecommitdiffstats
path: root/usr.sbin/memconfig
diff options
context:
space:
mode:
authormoritz <moritz@openbsd.org>2006-03-14 19:23:16 +0000
committermoritz <moritz@openbsd.org>2006-03-14 19:23:16 +0000
commitadd0f0d5ae817d3e3443bf49023e52b114cd967c (patch)
tree7c7b848f3bca5f8274350223efe21abbd19ef631 /usr.sbin/memconfig
parent*AliveCountMax applies to protcol v2 only; ok dtucker, djm (diff)
downloadwireguard-openbsd-add0f0d5ae817d3e3443bf49023e52b114cd967c.tar.xz
wireguard-openbsd-add0f0d5ae817d3e3443bf49023e52b114cd967c.zip
Some more usage of const and correct fmt string for a size_t.
From David Hill. ok ray@ jaredy@ otto@
Diffstat (limited to 'usr.sbin/memconfig')
-rw-r--r--usr.sbin/memconfig/memconfig.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/memconfig/memconfig.c b/usr.sbin/memconfig/memconfig.c
index 1dd3b2ddaf5..27ac18c07de 100644
--- a/usr.sbin/memconfig/memconfig.c
+++ b/usr.sbin/memconfig/memconfig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: memconfig.c,v 1.10 2003/12/04 03:08:26 deraadt Exp $ */
+/* $OpenBSD: memconfig.c,v 1.11 2006/03/14 19:23:16 moritz Exp $ */
/*-
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
@@ -40,7 +40,7 @@
#include <unistd.h>
struct {
- char *name;
+ const char *name;
int val;
int kind;
#define MDF_SETTABLE (1<<0)
@@ -64,13 +64,13 @@ static void listfunc(int, int, char *[]);
static void setfunc(int, int, char *[]);
static void clearfunc(int, int, char *[]);
static void helpfunc(int, int, char *[]);
-static void help(char *);
+static void help(const char *);
static struct mem_range_desc *mrgetall(int, int *);
struct
{
- char *cmd;
- char *desc;
+ const char *cmd;
+ const char *desc;
void (*func)(int, int, char *[]);
} functions[] = {
{"list",
@@ -136,7 +136,7 @@ mrgetall(int memfd, int *nmr)
*nmr = mro.mo_arg[0];
mrd = malloc(*nmr * sizeof(struct mem_range_desc));
if (mrd == NULL)
- errx(1, "can't allocate %d bytes for %d range descriptors",
+ errx(1, "can't allocate %zu bytes for %d range descriptors",
*nmr * sizeof(struct mem_range_desc), *nmr);
mro.mo_arg[0] = *nmr;
@@ -319,7 +319,7 @@ helpfunc(int memfd, int argc, char *argv[])
}
static void
-help(char *what)
+help(const char *what)
{
int i;