thodg/libgit2/src/oidmap.c

• Show log

  Commit

• Hash : 94af9155
  Author :
  Date : 2017-03-20T09:01:18
  

  map: remove `*map_free` macros
  
  The `map_free` functions were not implemented as functions but instead
  as macros which also set the map to NULL. While this is most certainly
  sensible in most cases, we should prefer the more obvious behavior,
  namingly leaving the map pointer intact.
  
  Furthermore, this macro has been refactored incorrectly during the
  map-refactorings: the two statements are not actually grouped together
  by a `do { ... } while (0)` block, as it is required for macros to
  match the behavior of functions more closely. This has led to at least
  one subtle nesting error in `pack-objects.c`. The following code block
  
  ```
      if (pb->object_ix)
          git_oidmap_free(pb->object_ix);
  ```
  
  would be expanded to
  
  ```
      if (pb->object_ix)
          git_oidmap__free(pb->object_ix); pb->object_ix = NULL;
  ```
  
  which is not what one woudl expect. While it is not a bug here as it
  would simply become a no-op, the wrong implementation could lead to bugs
  in other occasions.
  
  Fix this by simply removing the macro altogether and replacing it with
  real function calls. This leaves the burden of setting the pointer to
  NULL afterwards to the caller, but this is actually expected and behaves
  like other `free` functions.
  

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"
  
  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)
  
  git_oidmap *git_oidmap_alloc()
  {
  	return kh_init(oid);
  }
  
  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);
  }
  
  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);
  }
  

Download