On Sun, Oct 30, 2022 at 10:01:47PM +0000, Philip Oakley wrote: > > If I remember correctly, strbuf_utf8_replace() supports taking NULL as > > its last argument, though upon searching I couldn't find any callers > > that behave that way. Can we use that instead of supplying the empty > > string? If not, should we drop support for the NULL-as-last-argument? > > I wasalso concerned about zero length strings but my brief look at the > code indicated it could cope with a zero length string. > The last param is `const char *subst`. > > I've just relooked at the code and it does have a > > if (subst) > subst_len = strlen(subst); > > so it does look safe to pass NULL, though it would probably cause a > pause for thought for readers, and isn't likely to be that much faster > in these format scenarios. I'm not worried at all about speed, I was just wondering if there was a more designated helper for "truncate these many UTF-8 characters from the end of a string". It appears that passing NULL to that argument behaves the same as passing "", so I was wondering if it would be clearer to use that. But I'm fine either way. If there are no callers that pass NULL, then we should consider something like the following: --- 8< --- diff --git a/utf8.c b/utf8.c index de4ce5c0e6..e8813f64fe 100644 --- a/utf8.c +++ b/utf8.c @@ -361,10 +361,9 @@ void strbuf_utf8_replace(struct strbuf *sb_src, int pos, int width, char *src = sb_src->buf; char *end = src + sb_src->len; char *dst; - int w = 0, subst_len = 0; + int w = 0, subst_len; - if (subst) - subst_len = strlen(subst); + subst_len = strlen(subst); strbuf_grow(&sb_dst, sb_src->len + subst_len); dst = sb_dst.buf; --- >8 --- Below the context there is another "if (subst)", but that one needs to stay since we only perform the replacement once. Thanks, Taylor
