summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2015-04-29 16:46:40 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2015-04-29 16:46:40 +0000
commit90450e3ddfd5a2876148c81f8ccda61e4a00c605 (patch)
treea6cb8c36c514c4e5d4bf2abec273cbbc838c4cf4 /sbin
parent0490895889e154e20dce889ab43d6fcff031f008 (diff)
g/c unneeded second char * var, ok benno
Diffstat (limited to 'sbin')
-rw-r--r--sbin/disklabel/editor.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c
index 36df5cd8322..41ef9714072 100644
--- a/sbin/disklabel/editor.c
+++ b/sbin/disklabel/editor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: editor.c,v 1.293 2015/04/29 09:58:16 henning Exp $ */
+/* $OpenBSD: editor.c,v 1.294 2015/04/29 16:46:39 henning Exp $ */
/*
* Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -2377,7 +2377,7 @@ parse_autotable(char *filename)
{
FILE *cfile;
size_t len;
- char *buf, *p, *t;
+ char *buf, *t;
uint idx = 0, pctsum = 0;
struct space_allocation *sa;
@@ -2393,14 +2393,13 @@ parse_autotable(char *filename)
sa = &(alloc_table[0].table[idx]);
idx++;
- p = buf;
- if ((sa->mp = get_token(&p, &len)) == NULL ||
+ if ((sa->mp = get_token(&buf, &len)) == NULL ||
(sa->mp[0] != '/' && strcmp(sa->mp, "swap")))
errx(1, "%s: parse error on line %u", filename, idx);
- if ((t = get_token(&p, &len)) == NULL ||
+ if ((t = get_token(&buf, &len)) == NULL ||
parse_sizerange(t, &sa->minsz, &sa->maxsz) == -1)
errx(1, "%s: parse error on line %u", filename, idx);
- if ((t = get_token(&p, &len)) != NULL &&
+ if ((t = get_token(&buf, &len)) != NULL &&
parse_pct(t, &sa->rate) == -1)
errx(1, "%s: parse error on line %u", filename, idx);
if (sa->minsz > sa->maxsz)