Pacman-dev

Download

pacman-dev@lists.archlinux.org

January 2012

16 participants
52 discussions

[pacman-dev] [PATCH 1/6] Simplify hash function to a single multiplication
by Dan McGee 02 Jan '12

02 Jan '12

More than likely the compiler will do the three operation breakdown we had here before (2 shifts + subtraction), but let the compiler do the optimizations and make the actual operation more obvious. This actually slightly shrinks the function binary size, likely due to instruction reordering or something. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- 2^6 + 2^16 - 1 lib/libalpm/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index fc0e056..2cce824 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1145,7 +1145,7 @@ unsigned long _alpm_hash_sdbm(const char *str) return hash; } while((c = *str++)) { - hash = c + (hash << 6) + (hash << 16) - hash; + hash = c + hash * 65599; } return hash; -- 1.7.8.1

4 9

[pacman-dev] [PATCH] be_package.c: fix compiler warning
by Allan McRae 02 Jan '12

02 Jan '12

be_package.c: In function 'parse_descfile': be_package.c:181:28: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] ptr - key + 2 is guaranteed to be > 0 so we can cast to size_t Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I did reply to the patch email about this... lib/libalpm/be_package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index c602996..fccbb10 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -178,7 +178,7 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * /* line is always in this format: "key = value" * we can be sure the " = " exists, so look for that */ ptr = memchr(key, ' ', len); - if(!ptr || ptr - key + 2 > len || memcmp(ptr, " = ", 3) != 0) { + if(!ptr || (size_t)(ptr - key + 2) > len || memcmp(ptr, " = ", 3) != 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s: syntax error in description file line %d\n", newpkg->name ? newpkg->name : "error", linenum); -- 1.7.8.1

2 1