summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-10 21:47:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-10 21:47:40 (GMT)
commit52f6eec3056a5c2f566510902c2f10ac2ffeddec (patch)
tree108dbf225e3f0e6328b96ab163e0ffe4c3fc44de
parentf12f3af72677c966b0c485f7b0d4cf8ac25a032c (diff)
parent5062f9e1b5072adad3b40f1f9f29338f8fdd301d (diff)
downloadgit-52f6eec3056a5c2f566510902c2f10ac2ffeddec.zip
git-52f6eec3056a5c2f566510902c2f10ac2ffeddec.tar.gz
git-52f6eec3056a5c2f566510902c2f10ac2ffeddec.tar.bz2
Merge branch 'as/api-allocation-doc'
* as/api-allocation-doc: api-allocation-growing.txt: encourage better variable naming
-rw-r--r--Documentation/technical/api-allocation-growing.txt14
1 files changed, 8 insertions, 6 deletions
diff --git a/Documentation/technical/api-allocation-growing.txt b/Documentation/technical/api-allocation-growing.txt
index 43dbe09..542946b 100644
--- a/Documentation/technical/api-allocation-growing.txt
+++ b/Documentation/technical/api-allocation-growing.txt
@@ -5,7 +5,9 @@ Dynamically growing an array using realloc() is error prone and boring.
Define your array with:
-* a pointer (`ary`) that points at the array, initialized to `NULL`;
+* a pointer (`item`) that points at the array, initialized to `NULL`
+ (although please name the variable based on its contents, not on its
+ type);
* an integer variable (`alloc`) that keeps track of how big the current
allocation is, initialized to `0`;
@@ -13,22 +15,22 @@ Define your array with:
* another integer variable (`nr`) to keep track of how many elements the
array currently has, initialized to `0`.
-Then before adding `n`th element to the array, call `ALLOC_GROW(ary, n,
+Then before adding `n`th element to the item, call `ALLOC_GROW(item, n,
alloc)`. This ensures that the array can hold at least `n` elements by
calling `realloc(3)` and adjusting `alloc` variable.
------------
-sometype *ary;
+sometype *item;
size_t nr;
size_t alloc
for (i = 0; i < nr; i++)
- if (we like ary[i] already)
+ if (we like item[i] already)
return;
/* we did not like any existing one, so add one */
-ALLOC_GROW(ary, nr + 1, alloc);
-ary[nr++] = value you like;
+ALLOC_GROW(item, nr + 1, alloc);
+item[nr++] = value you like;
------------
You are responsible for updating the `nr` variable.