At Thu, 13 Oct 2011 11:19:13 +0900, MORITA Kazutaka wrote: > > At Wed, 12 Oct 2011 23:55:31 +0800, > Andychen wrote: > > > > From: Andy chen <sanjie.cyg at taobao.com> > > > > now if we set log level when start sheep, the log level not work, > > this patch fix this > > > > Signed-off-by: Andychen <sanjie.cyg at taobao.com> > > --- > > lib/logger.c | 6 +++--- > > 1 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/lib/logger.c b/lib/logger.c > > index 5fbbd75..f76e9e7 100644 > > --- a/lib/logger.c > > +++ b/lib/logger.c > > @@ -318,9 +318,6 @@ static void dolog(int prio, const char *func, int line, const char *fmt, va_list > > p += 3; > > } > > > > - if (prio > log_level) > > - return; > > - > > if (log_name) > > fprintf(stderr, "%s: %s(%d) %s", log_name, func, line, p); > > else > > @@ -332,6 +329,9 @@ static void dolog(int prio, const char *func, int line, const char *fmt, va_list > > > > void log_write(int prio, const char *func, int line, const char *fmt, ...) > > { > > + if (prio > log_level) > > + return; > > + > > va_list ap; > > The variable definition should be at the start of the function block. > > Looks good other than this. I've applied these 5 patches after fixing > it, thanks! Oops, this patchset seems to need v2 to address Yuan's comments. I've reverted just now, sorry. Thanks, Kazutaka |