thodg/libgit2/src/oidmap.c

• Show log

  Commit

• Hash : 9694ef20
  Author :
  Date : 2018-12-17T09:01:53
  

  oidmap: introduce high-level getter for values The current way of looking up an entry from a map is tightly coupled with the map implementation, as one first has to look up the index of the key and then retrieve the associated value by using the index. As a caller, you usually do not care about any indices at all, though, so this is more complicated than really necessary. Furthermore, it invites for errors to happen if the correct error checking sequence is not being followed. Introduce a new high-level function `git_oidmap_get` that takes a map and a key and returns a pointer to the associated value if such a key exists. Otherwise, a `NULL` pointer is returned. Adjust all callers that can trivially be converted.

Download

• src/oidmap.c

• /*
   * Copyright (C) the libgit2 contributors. All rights reserved.
   *
   * This file is part of libgit2, distributed under the GNU GPL v2 with
   * a Linking Exception. For full terms see the included COPYING file.
   */
  
  #include "oidmap.h"
  
  #define kmalloc git__malloc
  #define kcalloc git__calloc
  #define krealloc git__realloc
  #define kreallocarray git__reallocarray
  #define kfree git__free
  #include "khash.h"
  
  __KHASH_TYPE(oid, const git_oid *, void *)
  
  GIT_INLINE(khint_t) git_oidmap_hash(const git_oid *oid)
  {
  	khint_t h;
  	memcpy(&h, oid, sizeof(khint_t));
  	return h;
  }
  
  __KHASH_IMPL(oid, static kh_inline, const git_oid *, void *, 1, git_oidmap_hash, git_oid_equal)
  
  int git_oidmap_new(git_oidmap **out)
  {
  	*out = kh_init(oid);
  	GIT_ERROR_CHECK_ALLOC(*out);
  
  	return 0;
  }
  
  void git_oidmap_free(git_oidmap *map)
  {
  	kh_destroy(oid, map);
  }
  
  void git_oidmap_clear(git_oidmap *map)
  {
  	kh_clear(oid, map);
  }
  
  size_t git_oidmap_size(git_oidmap *map)
  {
  	return kh_size(map);
  }
  
  void *git_oidmap_get(git_oidmap *map, const git_oid *key)
  {
  	size_t idx = git_oidmap_lookup_index(map, key);
  	if (!git_oidmap_valid_index(map, idx) ||
  	    !git_oidmap_has_data(map, idx))
  		return NULL;
  	return kh_val(map, idx);
  }
  
  int git_oidmap_set(git_oidmap *map, const git_oid *key, void *value)
  {
  	size_t idx;
  	int rval;
  
  	idx = kh_put(oid, map, key, &rval);
  	if (rval < 0)
  		return -1;
  
  	if (rval == 0)
  		kh_key(map, idx) = key;
  
  	kh_val(map, idx) = value;
  
  	return 0;
  }
  
  size_t git_oidmap_lookup_index(git_oidmap *map, const git_oid *key)
  {
  	return kh_get(oid, map, key);
  }
  
  int git_oidmap_valid_index(git_oidmap *map, size_t idx)
  {
  	return idx != kh_end(map);
  }
  
  int git_oidmap_exists(git_oidmap *map, const git_oid *key)
  {
  	return kh_get(oid, map, key) != kh_end(map);
  }
  
  int git_oidmap_has_data(git_oidmap *map, size_t idx)
  {
  	return kh_exist(map, idx);
  }
  
  const git_oid *git_oidmap_key(git_oidmap *map, size_t idx)
  {
  	return kh_key(map, idx);
  }
  
  void git_oidmap_set_key_at(git_oidmap *map, size_t idx, git_oid *key)
  {
  	kh_key(map, idx) = key;
  }
  
  void *git_oidmap_value_at(git_oidmap *map, size_t idx)
  {
  	return kh_val(map, idx);
  }
  
  void git_oidmap_set_value_at(git_oidmap *map, size_t idx, void *value)
  {
  	kh_val(map, idx) = value;
  }
  
  void git_oidmap_delete_at(git_oidmap *map, size_t idx)
  {
  	kh_del(oid, map, idx);
  }
  
  int git_oidmap_put(git_oidmap *map, const git_oid *key, int *err)
  {
  	return kh_put(oid, map, key, err);
  }
  
  void git_oidmap_insert(git_oidmap *map, const git_oid *key, void *value, int *rval)
  {
  	khiter_t idx = kh_put(oid, map, key, rval);
  
  	if ((*rval) >= 0) {
  		if ((*rval) == 0)
  			kh_key(map, idx) = key;
  		kh_val(map, idx) = value;
  	}
  }
  
  void git_oidmap_delete(git_oidmap *map, const git_oid *key)
  {
  	khiter_t idx = git_oidmap_lookup_index(map, key);
  	if (git_oidmap_valid_index(map, idx))
  		git_oidmap_delete_at(map, idx);
  }
  
  size_t git_oidmap_begin(git_oidmap *map)
  {
  	GIT_UNUSED(map);
  	return 0;
  }
  
  size_t git_oidmap_end(git_oidmap *map)
  {
  	return map->n_buckets;
  }
  

Download