On Thu, Aug 05, 2010 at 02:50:11PM +0200, Jan Engelhardt wrote: > On Thursday 2010-08-05 13:48, Simon Horman wrote: > >+ > >+static const char *ip_vs_dbg_callid(char *buf, size_t buf_len, > >+ const char *callid, size_t callid_len, > >+ int *idx) > >+{ > >+ size_t len = min(min(callid_len, (size_t)64), buf_len - *idx - 1); > >+ memcpy(buf + *idx, callid, len); > >+ *(buf + *idx + len) = '\0'; > > Nothing particular wrong, though I just noticed that I would have > personally, instinctively written > > buf[*idx+len] = '\0'; > > instead. Sure you have your reasons ;-) Actually, I had a bit of trouble writing that code clearly (though I'm not sure why, perhaps it was late in the day). I think your suggestion looks good. > >+ /* RFC 2543 allows lines to be terminated with CR, LF or CRLF, > >+ * RFC 3261 allows only CRLF, we support both. */ > >+ if (*(dptr + *matchoff + *matchlen) != '\r' && > >+ *(dptr + *matchoff + *matchlen) != '\n') > >+ return -EINVAL; -- To unsubscribe from this list: send the line "unsubscribe netfilter" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html