From 0b857d83180412aff66d8226e9b6ccffcb3adf6f Mon Sep 17 00:00:00 2001 From: henning Date: Wed, 29 Apr 2015 16:46:39 +0000 Subject: [PATCH] g/c unneeded second char * var, ok benno --- sbin/disklabel/editor.c | 11 +++++------ 1 file 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 @@ -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) -- 2.20.1