convert trivial uses of strncmp() to starts_with()
It's more readable to use starts_with() instead of strncmp() to match a prefix, as the latter requires a manually-computed length, and has the funny "matching is zero" return value common to cmp functions. This patch converts several cases which were found with: git grep 'strncmp(.*, [0-9]*)' But note that it doesn't convert all such cases. There are several where the magic length number is repeated elsewhere in the code, like: /* handle "buf" which isn't NUL-terminated and might be too small */ if (len >= 3 && !strncmp(buf, "foo", 3)) or: /* exact match for "foo", but within a larger string */ if (end - buf == 3 && !strncmp(buf, "foo", 3)) While it would not produce the wrong outcome to use starts_with() in these cases, we'd still be left with one instance of "3". We're better to leave them for now, as the repeated "3" makes it clear that the two are linked (there may be other refactorings that handle both, but they're out of scope for this patch). A few things to note while reading the patch: - all cases but one are trying to match, and so lose the extra "!". The case in the first hunk of urlmatch.c is not-matching, and hence gains a "!". - the case in remote-fd.c is matching the beginning of "connect foo", but we never look at str+8 to parse the "foo" part (which would make this a candidate for skip_prefix(), not starts_with()). This seems at first glance like a bug, but is a limitation of how remote-fd works. - the second hunk in urlmatch.c shows some cases adjacent to other strncmp() calls that are left. These are of the "exact match within a larger string" type, as described above. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
4dbebc36b0
commit
20869d1a1d
@ -40,7 +40,7 @@ static void command_loop(int input_fd, int output_fd)
|
|||||||
if (!strcmp(buffer, "capabilities")) {
|
if (!strcmp(buffer, "capabilities")) {
|
||||||
printf("*connect\n\n");
|
printf("*connect\n\n");
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
} else if (!strncmp(buffer, "connect ", 8)) {
|
} else if (starts_with(buffer, "connect ")) {
|
||||||
printf("\n");
|
printf("\n");
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
if (bidirectional_transfer_loop(input_fd,
|
if (bidirectional_transfer_loop(input_fd,
|
||||||
|
@ -620,7 +620,7 @@ static int config_to_packet_line(const char *key, const char *value, void *data)
|
|||||||
{
|
{
|
||||||
struct packet_reader *writer = data;
|
struct packet_reader *writer = data;
|
||||||
|
|
||||||
if (!strncmp(key, "bundle.", 7))
|
if (starts_with(key, "bundle."))
|
||||||
packet_write_fmt(writer->fd, "%s=%s", key, value);
|
packet_write_fmt(writer->fd, "%s=%s", key, value);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -1209,7 +1209,7 @@ static const char *copy_name(const char *buf)
|
|||||||
{
|
{
|
||||||
const char *cp;
|
const char *cp;
|
||||||
for (cp = buf; *cp && *cp != '\n'; cp++) {
|
for (cp = buf; *cp && *cp != '\n'; cp++) {
|
||||||
if (!strncmp(cp, " <", 2))
|
if (starts_with(cp, " <"))
|
||||||
return xmemdupz(buf, cp - buf);
|
return xmemdupz(buf, cp - buf);
|
||||||
}
|
}
|
||||||
return xstrdup("");
|
return xstrdup("");
|
||||||
|
@ -209,7 +209,7 @@ static char *url_normalize_1(const char *url, struct url_info *out_info, char al
|
|||||||
*/
|
*/
|
||||||
if (!url_len || strchr(":/?#", *url)) {
|
if (!url_len || strchr(":/?#", *url)) {
|
||||||
/* Missing host invalid for all URL schemes except file */
|
/* Missing host invalid for all URL schemes except file */
|
||||||
if (strncmp(norm.buf, "file:", 5)) {
|
if (!starts_with(norm.buf, "file:")) {
|
||||||
if (out_info) {
|
if (out_info) {
|
||||||
out_info->url = NULL;
|
out_info->url = NULL;
|
||||||
out_info->err = _("missing host and scheme is not 'file:'");
|
out_info->err = _("missing host and scheme is not 'file:'");
|
||||||
@ -268,11 +268,11 @@ static char *url_normalize_1(const char *url, struct url_info *out_info, char al
|
|||||||
if (url == slash_ptr) {
|
if (url == slash_ptr) {
|
||||||
/* Skip ":" port with no number, it's same as default */
|
/* Skip ":" port with no number, it's same as default */
|
||||||
} else if (slash_ptr - url == 2 &&
|
} else if (slash_ptr - url == 2 &&
|
||||||
!strncmp(norm.buf, "http:", 5) &&
|
starts_with(norm.buf, "http:") &&
|
||||||
!strncmp(url, "80", 2)) {
|
!strncmp(url, "80", 2)) {
|
||||||
/* Skip http :80 as it's the default */
|
/* Skip http :80 as it's the default */
|
||||||
} else if (slash_ptr - url == 3 &&
|
} else if (slash_ptr - url == 3 &&
|
||||||
!strncmp(norm.buf, "https:", 6) &&
|
starts_with(norm.buf, "https:") &&
|
||||||
!strncmp(url, "443", 3)) {
|
!strncmp(url, "443", 3)) {
|
||||||
/* Skip https :443 as it's the default */
|
/* Skip https :443 as it's the default */
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user