Commit 2cd5e81d authored by Rusty Russell's avatar Rusty Russell

tal: rename tal_len to tal_bytelen.

I had a bug caused by using tal_len instead of tal_count: let's make
it explicit. @jb55 commented "ha. I always forget which one does which... Ack"
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 92be2eff
...@@ -656,7 +656,7 @@ const char *tal_name(const tal_t *t) ...@@ -656,7 +656,7 @@ const char *tal_name(const tal_t *t)
return n->name; return n->name;
} }
size_t tal_len(const tal_t *ptr) size_t tal_bytelen(const tal_t *ptr)
{ {
struct length *l; struct length *l;
......
...@@ -310,16 +310,16 @@ const char *tal_name(const tal_t *ptr); ...@@ -310,16 +310,16 @@ const char *tal_name(const tal_t *ptr);
* Returns 0 if @ptr has no length property or is NULL, but be aware * Returns 0 if @ptr has no length property or is NULL, but be aware
* that that is also a valid size! * that that is also a valid size!
*/ */
#define tal_count(p) (tal_len(p) / sizeof(*p)) #define tal_count(p) (tal_bytelen(p) / sizeof(*p))
/** /**
* tal_len - get the count of bytes in a tal_arr. * tal_bytelen - get the count of bytes in a tal_arr.
* @ptr: The tal allocated object array (or NULL) * @ptr: The tal allocated object array (or NULL)
* *
* Returns 0 if @ptr has no length property or NULL, but be aware that that is * Returns 0 if @ptr has no length property or NULL, but be aware that that is
* also a valid size! * also a valid size!
*/ */
size_t tal_len(const tal_t *ptr); size_t tal_bytelen(const tal_t *ptr);
/** /**
* tal_first - get the first immediate tal object child. * tal_first - get the first immediate tal object child.
......
...@@ -46,7 +46,7 @@ int main(void) ...@@ -46,7 +46,7 @@ int main(void)
plan_tests(2 + 19 * 3); plan_tests(2 + 19 * 3);
p1 = NULL; p1 = NULL;
ok1(tal_len(p1) == 0); ok1(tal_bytelen(p1) == 0);
ok1(tal_count(p1) == 0); ok1(tal_count(p1) == 0);
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment