Messages in this thread | | | Date | Mon, 26 Nov 2007 10:17:47 +0100 | From | Samuel Ortiz <> | Subject | Re: [PATCH] net/irda/parameters.c: Trivial fixes |
| |
Hi Richard,
On Sat, Nov 24, 2007 at 09:44:05PM +0100, Richard Knutsson wrote: > Make a single va_start() -> va_end() path + fixing: Ok, this should be 2 separate patches then. The warning fixes are all good, but I fail to see the point of the va_end() one. That doesn't seem to bring any sort of improvement while adding one variable to the stack and one loop test. Any explanation here ?
I'll push the warning fix for now, thanks.
Cheers, Samuel.
> CHECK /home/kernel/src/net/irda/parameters.c > /home/kernel/src/net/irda/parameters.c:466:2: warning: Using plain integer as NULL pointer > /home/kernel/src/net/irda/parameters.c:520:2: warning: Using plain integer as NULL pointer > /home/kernel/src/net/irda/parameters.c:573:2: warning: Using plain integer as NULL pointer > > Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se> > --- > Compile-tested on i386 with allyesconfig and allmodconfig. > > > diff --git a/net/irda/parameters.c b/net/irda/parameters.c > index 2627dad..bf19071 100644 > --- a/net/irda/parameters.c > +++ b/net/irda/parameters.c > @@ -368,10 +368,11 @@ int irda_param_pack(__u8 *buf, char *fmt, ...) > va_list args; > char *p; > int n = 0; > + int retval = 0; > > va_start(args, fmt); > > - for (p = fmt; *p != '\0'; p++) { > + for (p = fmt; *p != '\0' && retval == 0; p++) { > switch (*p) { > case 'b': /* 8 bits unsigned byte */ > buf[n++] = (__u8)va_arg(args, int); > @@ -392,13 +393,12 @@ int irda_param_pack(__u8 *buf, char *fmt, ...) > break; > #endif > default: > - va_end(args); > - return -1; > + retval = -1; > } > } > va_end(args); > > - return 0; > + return retval; > } > EXPORT_SYMBOL(irda_param_pack); > > @@ -411,10 +411,11 @@ static int irda_param_unpack(__u8 *buf, char *fmt, ...) > va_list args; > char *p; > int n = 0; > + int retval = 0; > > va_start(args, fmt); > > - for (p = fmt; *p != '\0'; p++) { > + for (p = fmt; *p != '\0' && retval == 0; p++) { > switch (*p) { > case 'b': /* 8 bits byte */ > arg.ip = va_arg(args, __u32 *); > @@ -436,14 +437,13 @@ static int irda_param_unpack(__u8 *buf, char *fmt, ...) > break; > #endif > default: > - va_end(args); > - return -1; > + retval = -1; > } > > } > va_end(args); > > - return 0; > + return retval; > } > > /* > @@ -463,7 +463,7 @@ int irda_param_insert(void *self, __u8 pi, __u8 *buf, int len, > int n = 0; > > IRDA_ASSERT(buf != NULL, return ret;); > - IRDA_ASSERT(info != 0, return ret;); > + IRDA_ASSERT(info != NULL, return ret;); > > pi_minor = pi & info->pi_mask; > pi_major = pi >> info->pi_major_offset; > @@ -517,7 +517,7 @@ static int irda_param_extract(void *self, __u8 *buf, int len, > int n = 0; > > IRDA_ASSERT(buf != NULL, return ret;); > - IRDA_ASSERT(info != 0, return ret;); > + IRDA_ASSERT(info != NULL, return ret;); > > pi_minor = buf[n] & info->pi_mask; > pi_major = buf[n] >> info->pi_major_offset; > @@ -570,7 +570,7 @@ int irda_param_extract_all(void *self, __u8 *buf, int len, > int n = 0; > > IRDA_ASSERT(buf != NULL, return ret;); > - IRDA_ASSERT(info != 0, return ret;); > + IRDA_ASSERT(info != NULL, return ret;); > > /* > * Parse all parameters. Each parameter must be at least two bytes
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |