1.1 --- a/ucx/map.c Thu Oct 11 16:29:30 2012 +0200
1.2 +++ b/ucx/map.c Fri Oct 12 10:54:55 2012 +0200
1.3 @@ -177,7 +177,7 @@
1.4 UcxKey key;
1.5 key.data = data;
1.6 key.len = len;
1.7 - key.hash = ucx_hash(data, len);
1.8 + key.hash = ucx_hash((const char*) data, len);
1.9 return key;
1.10 }
1.11
1.12 @@ -281,13 +281,13 @@
1.13
1.14 /* read into key buffer */
1.15 n = 16;
1.16 - key = malloc(n);
1.17 + key = (char*) malloc(n);
1.18 r = 0;
1.19 do {
1.20 if (c == '=') break;
1.21 if (r > n - 2) {
1.22 n *= 2;
1.23 - key = realloc(key, n);
1.24 + key = (char*) realloc(key, n);
1.25 }
1.26 key[r] = c;
1.27 r++;
1.28 @@ -310,13 +310,13 @@
1.29
1.30 /* read into value buffer */
1.31 n = 64;
1.32 - value = malloc(n);
1.33 + value = (char*) malloc(n);
1.34 r = 0;
1.35 do {
1.36 if (c == '\n') break;
1.37 if (r > n - 2) {
1.38 n *= 2;
1.39 - value = realloc(value, n);
1.40 + value = (char*) realloc(value, n);
1.41 }
1.42 value[r] = c;
1.43 r++;
1.44 @@ -328,18 +328,18 @@
1.45 size_t decodedSize;
1.46 void *decoded = decoder(value, decdata, &decodedSize);
1.47 free(value);
1.48 - value = decoded;
1.49 + value = (char*) decoded;
1.50 r = decodedSize;
1.51 } else {
1.52 r += 2;
1.53 - value = realloc(value, r);
1.54 + value = (char*) realloc(value, r);
1.55 }
1.56
1.57 if (allocator.pool) {
1.58 void *pooledValue = allocator.malloc(allocator.pool, r);
1.59 memcpy(pooledValue, value, r);
1.60 free(value);
1.61 - value = pooledValue;
1.62 + value = (char*) pooledValue;
1.63 }
1.64
1.65 ucx_map_cstr_put(map, key, value);
1.66 @@ -362,7 +362,7 @@
1.67 if (encoder) {
1.68 size_t encodedSize;
1.69 void *encoded = encoder(v, encdata, &encodedSize);
1.70 - value = sstrn(encoded,encodedSize - 1);
1.71 + value = sstrn((char*) encoded,encodedSize - 1);
1.72 } else {
1.73 value = sstr(v);
1.74 }
