Merge remote-tracking branch 'upstream/unstable' into help_subcommands

This commit is contained in:
Itamar Haber
2017-12-05 18:14:59 +02:00
45 changed files with 3316 additions and 376 deletions

View File

@ -653,7 +653,7 @@ unsigned int keyHashSlot(char *key, int keylen) {
for (e = s+1; e < keylen; e++)
if (key[e] == '}') break;
/* No '}' or nothing betweeen {} ? Hash the whole key. */
/* No '}' or nothing between {} ? Hash the whole key. */
if (e == keylen || e == s+1) return crc16(key,keylen) & 0x3FFF;
/* If we are here there is both a { and a } on its right. Hash