Made requested fixes

pull/2141/head
murgatroid99 10 years ago
parent d1873b0128
commit 154cb407a8
  1. 4
      src/core/support/murmur_hash.c
  2. 6
      src/core/support/slice.c

@ -78,9 +78,9 @@ gpr_uint32 gpr_murmur_hash3(const void *key, size_t len, gpr_uint32 seed) {
/* tail */ /* tail */
switch (len & 3) { switch (len & 3) {
case 3: case 3:
k1 ^= (gpr_uint32)(tail[2] << 16); k1 ^= ((gpr_uint32)tail[2]) << 16;
case 2: case 2:
k1 ^= (gpr_uint32)(tail[1] << 8); k1 ^= ((gpr_uint32)tail[1]) << 8;
case 1: case 1:
k1 ^= tail[0]; k1 ^= tail[0];
k1 *= c1; k1 *= c1;

@ -31,6 +31,8 @@
* *
*/ */
#include <sys/types.h>
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/slice.h> #include <grpc/support/slice.h>
@ -313,7 +315,7 @@ gpr_slice gpr_slice_split_head(gpr_slice *source, size_t split) {
} }
int gpr_slice_cmp(gpr_slice a, gpr_slice b) { int gpr_slice_cmp(gpr_slice a, gpr_slice b) {
int d = (int)(GPR_SLICE_LENGTH(a) - GPR_SLICE_LENGTH(b)); ssize_t d = (ssize_t)(GPR_SLICE_LENGTH(a) - GPR_SLICE_LENGTH(b));
if (d != 0) return d; if (d != 0) return d;
return memcmp(GPR_SLICE_START_PTR(a), GPR_SLICE_START_PTR(b), return memcmp(GPR_SLICE_START_PTR(a), GPR_SLICE_START_PTR(b),
GPR_SLICE_LENGTH(a)); GPR_SLICE_LENGTH(a));
@ -321,7 +323,7 @@ int gpr_slice_cmp(gpr_slice a, gpr_slice b) {
int gpr_slice_str_cmp(gpr_slice a, const char *b) { int gpr_slice_str_cmp(gpr_slice a, const char *b) {
size_t b_length = strlen(b); size_t b_length = strlen(b);
int d = (int)(GPR_SLICE_LENGTH(a) - b_length); ssize_t d = (ssize_t)(GPR_SLICE_LENGTH(a) - b_length);
if (d != 0) return d; if (d != 0) return d;
return memcmp(GPR_SLICE_START_PTR(a), b, b_length); return memcmp(GPR_SLICE_START_PTR(a), b, b_length);
} }

Loading…
Cancel
Save