git/help.c, branch v2.4.2

Merge branch 'sb/help-unknown-command-sort-fix'

2014-09-26T21:39:49Z

Code cleanup. * sb/help-unknown-command-sort-fix: help: fix the size passed to qsort

help: fix the size passed to qsort

2014-09-18T17:17:53Z

We actually want to have the size of one 'name' and not the size of the pointer. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

Merge branch 'jk/strip-suffix'

2014-07-16T18:26:00Z

* jk/strip-suffix: prepare_packed_git_one: refactor duplicate-pack check verify-pack: use strbuf_strip_suffix strbuf: implement strbuf_strip_suffix index-pack: use strip_suffix to avoid magic numbers use strip_suffix instead of ends_with in simple cases replace has_extension with ends_with implement ends_with via strip_suffix add strip_suffix function sha1_file: replace PATH_MAX buffer with strbuf in prepare_packed_git_one()

use strip_suffix instead of ends_with in simple cases

2014-06-30T20:43:17Z

When stripping a suffix like: if (ends_with(str, "foo")) buf = xmemdupz(str, strlen(str) - 3); we can instead use strip_suffix to avoid the constant 3, which must match the literal "foo" (we sometimes use strlen("foo") instead, but that means we are repeating ourselves). The example above becomes: if (strip_suffix(str, "foo", &len)) buf = xmemdupz(str, len); This also saves a strlen(), since we calculate the string length when detecting the suffix. Note that in some cases we also switch from xstrndup to xmemdupz, which saves a further strlen call. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

replace has_extension with ends_with

2014-06-30T20:43:16Z

These two are almost the same function, with the exception that has_extension only matches if there is content before the suffix. So ends_with(".exe", ".exe") is true, but has_extension would not be. This distinction does not matter to any of the callers, though, and we can just replace uses of has_extension with ends_with. We prefer the "ends_with" name because it is more generic, and there is nothing about the function that requires it to be used for file extensions. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

use skip_prefix to avoid repeated calculations

2014-06-20T17:45:19Z

In some cases, we use starts_with to check for a prefix, and then use an already-calculated prefix length to advance a pointer past the prefix. There are no magic numbers or duplicated strings here, but we can still make the code simpler and more obvious by using skip_prefix. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

use skip_prefix to avoid repeating strings

2014-06-20T17:44:45Z

It's a common idiom to match a prefix and then skip past it with strlen, like: if (starts_with(foo, "bar")) foo += strlen("bar"); This avoids magic numbers, but means we have to repeat the string (and there is no compiler check that we didn't make a typo in one of the strings). We can use skip_prefix to handle this case without repeating ourselves. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

use skip_prefix to avoid magic numbers

2014-06-20T17:44:45Z

It's a common idiom to match a prefix and then skip past it with a magic number, like: if (starts_with(foo, "bar")) foo += 3; This is easy to get wrong, since you have to count the prefix string yourself, and there's no compiler check if the string changes. We can use skip_prefix to avoid the magic numbers here. Note that some of these conversions could be much shorter. For example: if (starts_with(arg, "--foo=")) { bar = arg + 6; continue; } could become: if (skip_prefix(arg, "--foo=", &bar)) continue; However, I have left it as: if (skip_prefix(arg, "--foo=", &v)) { bar = v; continue; } to visually match nearby cases which need to actually process the string. Like: if (skip_prefix(arg, "--foo=", &v)) { bar = atoi(v); continue; } Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'rt/help-pretty-prints-cmd-names'

2014-03-14T21:27:00Z

* rt/help-pretty-prints-cmd-names: help.c: rename function "pretty_print_string_list"

help.c: rename function "pretty_print_string_list"

2014-02-28T21:24:53Z

The part "string_list" of the name of function "pretty_print_string_list" is just an implementation detail. The function pretty-prints command names so rename it to "pretty_print_cmdnames". Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano