Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-08-24 17:08:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-08-24 17:08:55 +0400
commitf2acb10b6b160b9ab85591d4717e27be800a0568 (patch)
tree367c137cfb82c88e2fbe5ab3e4ae23d0ea18731d /source/blender/blenlib/intern/edgehash.c
parent9c090cecfe21ef357031373b0711a2bc57ee5176 (diff)
edge hash: take an arg for the guarded-malloc string (as ghash does)
Diffstat (limited to 'source/blender/blenlib/intern/edgehash.c')
-rw-r--r--source/blender/blenlib/intern/edgehash.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c
index 738f1f0c7a1..25db659b3d4 100644
--- a/source/blender/blenlib/intern/edgehash.c
+++ b/source/blender/blenlib/intern/edgehash.c
@@ -162,9 +162,10 @@ static void edgehash_insert_ex(EdgeHash *eh, unsigned int v0, unsigned int v1, v
/* Public API */
-EdgeHash *BLI_edgehash_new_ex(const unsigned int nentries_reserve)
+EdgeHash *BLI_edgehash_new_ex(const char *info,
+ const unsigned int nentries_reserve)
{
- EdgeHash *eh = MEM_callocN(sizeof(*eh), "EdgeHash");
+ EdgeHash *eh = MEM_mallocN(sizeof(*eh), info);
eh->nbuckets = _ehash_hashsizes[0]; /* eh->cursize */
eh->nentries = 0;
@@ -184,9 +185,9 @@ EdgeHash *BLI_edgehash_new_ex(const unsigned int nentries_reserve)
return eh;
}
-EdgeHash *BLI_edgehash_new(void)
+EdgeHash *BLI_edgehash_new(const char *info)
{
- return BLI_edgehash_new_ex(0);
+ return BLI_edgehash_new_ex(info, 0);
}
/**