On Wed, Oct 23, 2013 at 07:34:18PM +0200, Erik Faye-Lund wrote: > >> - memcpy(path, state->base_dir, len); > >> - strcpy(path + len, ce->name); > >> - len += ce_namelen(ce); > >> + strbuf_reset(&path_buf); > >> + strbuf_addf(&path_buf, "%.*s%s", state->base_dir_len, state->base_dir, ce->name); > >> + path = path_buf.buf; > >> + len = path_buf.len; > > > > This is not something you introduced, but while we are here, you may > > want to use ce->namelen, which would be a little faster than treating it > > as a string (especially for strbuf, as it can then know up front how big > > the size is). > > > > I doubt it's measurable, though (especially as the growth cost is > > amortized due to the static buffer). > > I somehow feel that: > > strbuf_reset(&path_buf); > strbuf_add(&path_buf, state->base_dir, state->base_dir_len); > strbuf_addch(&path_buf, '/'); > strbuf_add(&path_buf, state->name, state->name_len); > > feels a bit neater than using strbuf_addf. But that might just be me. I agree. But note that your addch is a bug. :) -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html