Mercurial > hg > ucx / file diff

     1.1 --- a/src/map.c	Wed Oct 18 12:03:44 2017 +0200
     1.2 +++ b/src/map.c	Wed Oct 18 14:23:57 2017 +0200
     1.3 @@ -99,8 +99,7 @@
     1.4      map->count = 0;
     1.5  }
     1.6  
     1.7 -int ucx_map_copy(UcxMap *restrict from, UcxMap *restrict to,
     1.8 -        copy_func fnc, void *data) {
     1.9 +int ucx_map_copy(UcxMap *from, UcxMap *to, copy_func fnc, void *data) {
    1.10      UcxMapIterator i = ucx_map_iterator(from);
    1.11      void *value;
    1.12      UCX_MAP_FOREACH(key, value, i) {
    1.13 @@ -155,8 +154,8 @@
    1.14      }
    1.15  
    1.16      size_t slot = key.hash%map->size;
    1.17 -    UcxMapElement *restrict elm = map->map[slot];
    1.18 -    UcxMapElement *restrict prev = NULL;
    1.19 +    UcxMapElement *elm = map->map[slot];
    1.20 +    UcxMapElement *prev = NULL;
    1.21  
    1.22      while (elm && elm->key.hash < key.hash) {
    1.23          prev = elm;
    1.24 @@ -194,14 +193,14 @@
    1.25      return 0;
    1.26  }
    1.27  
    1.28 -void* ucx_map_get_and_remove(UcxMap *map, UcxKey key, _Bool remove) {
    1.29 +static void* ucx_map_get_and_remove(UcxMap *map, UcxKey key, int remove) {
    1.30      if(key.hash == 0) {
    1.31          key.hash = ucx_hash((char*)key.data, key.len);
    1.32      }
    1.33      
    1.34      size_t slot = key.hash%map->size;
    1.35 -    UcxMapElement *restrict elm = map->map[slot];
    1.36 -    UcxMapElement *restrict pelm = NULL;
    1.37 +    UcxMapElement *elm = map->map[slot];
    1.38 +    UcxMapElement *pelm = NULL;
    1.39      while (elm && elm->key.hash <= key.hash) {
    1.40          if(elm->key.hash == key.hash) {
    1.41              int n = (key.len > elm->key.len) ? elm->key.len : key.len;