diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-17 04:52:36 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-17 04:52:36 +0400 |
commit | ad96dacbc5a7cc61ccf74405927847f243a955b5 (patch) | |
tree | a2b78d3b502b99a1c7e59e8400dfd0807a896125 /source/blender/blenlib/intern/edgehash.c | |
parent | 9276fb479ed1c5b472c5d831f52913157efe9288 (diff) |
style edit only - move parenthesis onto second line of function definition (in keeping with most of blenders code)
also split some long lines in own code.
Diffstat (limited to 'source/blender/blenlib/intern/edgehash.c')
-rw-r--r-- | source/blender/blenlib/intern/edgehash.c | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c index 0eda3e78824..7ae68101154 100644 --- a/source/blender/blenlib/intern/edgehash.c +++ b/source/blender/blenlib/intern/edgehash.c @@ -64,7 +64,8 @@ struct EdgeHash { /***/ -EdgeHash *BLI_edgehash_new(void) { +EdgeHash *BLI_edgehash_new(void) +{ EdgeHash *eh= MEM_mallocN(sizeof(*eh), "EdgeHash"); eh->cursize= 0; eh->nentries= 0; @@ -76,7 +77,8 @@ EdgeHash *BLI_edgehash_new(void) { return eh; } -void BLI_edgehash_insert(EdgeHash *eh, int v0, int v1, void *val) { +void BLI_edgehash_insert(EdgeHash *eh, int v0, int v1, void *val) +{ unsigned int hash; Entry *e= malloc(sizeof(*e)); @@ -117,7 +119,8 @@ void BLI_edgehash_insert(EdgeHash *eh, int v0, int v1, void *val) { } } -void** BLI_edgehash_lookup_p(EdgeHash *eh, int v0, int v1) { +void** BLI_edgehash_lookup_p(EdgeHash *eh, int v0, int v1) +{ unsigned int hash; Entry *e; @@ -134,21 +137,25 @@ void** BLI_edgehash_lookup_p(EdgeHash *eh, int v0, int v1) { return NULL; } -void* BLI_edgehash_lookup(EdgeHash *eh, int v0, int v1) { +void* BLI_edgehash_lookup(EdgeHash *eh, int v0, int v1) +{ void **value_p = BLI_edgehash_lookup_p(eh,v0,v1); return value_p?*value_p:NULL; } -int BLI_edgehash_haskey(EdgeHash *eh, int v0, int v1) { +int BLI_edgehash_haskey(EdgeHash *eh, int v0, int v1) +{ return BLI_edgehash_lookup_p(eh, v0, v1)!=NULL; } -int BLI_edgehash_size(EdgeHash *eh) { +int BLI_edgehash_size(EdgeHash *eh) +{ return eh->nentries; } -void BLI_edgehash_clear(EdgeHash *eh, EdgeHashFreeFP valfreefp) { +void BLI_edgehash_clear(EdgeHash *eh, EdgeHashFreeFP valfreefp) +{ int i; for (i=0; i<eh->nbuckets; i++) { @@ -168,7 +175,8 @@ void BLI_edgehash_clear(EdgeHash *eh, EdgeHashFreeFP valfreefp) { eh->nentries= 0; } -void BLI_edgehash_free(EdgeHash *eh, EdgeHashFreeFP valfreefp) { +void BLI_edgehash_free(EdgeHash *eh, EdgeHashFreeFP valfreefp) +{ BLI_edgehash_clear(eh, valfreefp); free(eh->buckets); @@ -184,7 +192,8 @@ struct EdgeHashIterator { Entry *curEntry; }; -EdgeHashIterator *BLI_edgehashIterator_new(EdgeHash *eh) { +EdgeHashIterator *BLI_edgehashIterator_new(EdgeHash *eh) +{ EdgeHashIterator *ehi= malloc(sizeof(*ehi)); ehi->eh= eh; ehi->curEntry= NULL; @@ -197,26 +206,31 @@ EdgeHashIterator *BLI_edgehashIterator_new(EdgeHash *eh) { } return ehi; } -void BLI_edgehashIterator_free(EdgeHashIterator *ehi) { +void BLI_edgehashIterator_free(EdgeHashIterator *ehi) +{ free(ehi); } -void BLI_edgehashIterator_getKey(EdgeHashIterator *ehi, int *v0_r, int *v1_r) { +void BLI_edgehashIterator_getKey(EdgeHashIterator *ehi, int *v0_r, int *v1_r) +{ if (ehi->curEntry) { *v0_r = ehi->curEntry->v0; *v1_r = ehi->curEntry->v1; } } -void *BLI_edgehashIterator_getValue(EdgeHashIterator *ehi) { +void *BLI_edgehashIterator_getValue(EdgeHashIterator *ehi) +{ return ehi->curEntry?ehi->curEntry->val:NULL; } -void BLI_edgehashIterator_setValue(EdgeHashIterator *ehi, void *val) { +void BLI_edgehashIterator_setValue(EdgeHashIterator *ehi, void *val) +{ if(ehi->curEntry) ehi->curEntry->val= val; } -void BLI_edgehashIterator_step(EdgeHashIterator *ehi) { +void BLI_edgehashIterator_step(EdgeHashIterator *ehi) +{ if (ehi->curEntry) { ehi->curEntry= ehi->curEntry->next; while (!ehi->curEntry) { @@ -227,7 +241,8 @@ void BLI_edgehashIterator_step(EdgeHashIterator *ehi) { } } } -int BLI_edgehashIterator_isDone(EdgeHashIterator *ehi) { +int BLI_edgehashIterator_isDone(EdgeHashIterator *ehi) +{ return !ehi->curEntry; } |