From 6bef3d1d2216234454875052220ca0f477a820b4 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Tue, 6 Nov 2007 03:05:54 +0000 Subject: fbset: fix buglet where we were using wrong pointer readahead: stop using stdio.h *: style fixes --- runit/runit_lib.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'runit') diff --git a/runit/runit_lib.c b/runit/runit_lib.c index 2ed9054fd..bedd5401f 100644 --- a/runit/runit_lib.c +++ b/runit/runit_lib.c @@ -233,19 +233,23 @@ unsigned pmatch(const char *p, const char *s, unsigned len) if (!c) return !len; switch (c) { case '*': - if (!(c = *p)) return 1; + c = *p; + if (!c) return 1; for (;;) { if (!len) return 0; if (*s == c) break; - ++s; --len; + ++s; + --len; } continue; case '+': - if ((c = *p++) != *s) return 0; + c = *p++; + if (c != *s) return 0; for (;;) { if (!len) return 1; if (*s != c) break; - ++s; --len; + ++s; + --len; } continue; /* @@ -260,7 +264,8 @@ unsigned pmatch(const char *p, const char *s, unsigned len) default: if (!len) return 0; if (*s != c) return 0; - ++s; --len; + ++s; + --len; continue; } } -- cgit v1.2.3