Commit 4710a928 authored by Rusty Russell's avatar Rusty Russell

tal/str: rename tal_asprintf/tal_vasprintf to tal_fmt/tal_vfmt.

Shorter, sweeter, and less legacy.
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent a5ebf314
......@@ -40,19 +40,19 @@ char *tal_strndup(const tal_t *ctx, const char *p, size_t n)
return ret;
}
char *tal_asprintf(const tal_t *ctx, const char *fmt, ...)
char *tal_fmt(const tal_t *ctx, const char *fmt, ...)
{
va_list ap;
char *ret;
va_start(ap, fmt);
ret = tal_vasprintf(ctx, fmt, ap);
ret = tal_vfmt(ctx, fmt, ap);
va_end(ap);
return ret;
}
char *tal_vasprintf(const tal_t *ctx, const char *fmt, va_list ap)
char *tal_vfmt(const tal_t *ctx, const char *fmt, va_list ap)
{
size_t max;
char *buf;
......
......@@ -24,19 +24,19 @@ char *tal_strdup(const tal_t *ctx, const char *p);
char *tal_strndup(const tal_t *ctx, const char *p, size_t n);
/**
* tal_asprintf - allocate a formatted string
* tal_fmt - allocate a formatted string
* @ctx: NULL, or tal allocated object to be parent.
* @fmt: the printf-style format (can be take()).
*/
char *tal_asprintf(const tal_t *ctx, const char *fmt, ...) PRINTF_FMT(2,3);
char *tal_fmt(const tal_t *ctx, const char *fmt, ...) PRINTF_FMT(2,3);
/**
* tal_vasprintf - allocate a formatted string (va_list version)
* tal_vfmt - allocate a formatted string (va_list version)
* @ctx: NULL, or tal allocated object to be parent.
* @fmt: the printf-style format (can be take()).
* @va: the va_list containing the format args.
*/
char *tal_vasprintf(const tal_t *ctx, const char *fmt, va_list ap)
char *tal_vfmt(const tal_t *ctx, const char *fmt, va_list ap)
PRINTF_FMT(2,0);
/**
......
......@@ -36,7 +36,7 @@ int main(void)
strcat(c, "x");
tal_free(c);
c = tal_asprintf(parent, "hello %s", "there");
c = tal_fmt(parent, "hello %s", "there");
ok1(strcmp(c, "hello there") == 0);
ok1(tal_parent(c) == parent);
tal_free(c);
......
......@@ -27,7 +27,7 @@ int main(void)
tal_free(c);
c = tal_strdup(parent, "hello %s");
c = tal_asprintf(parent, take(c), "there");
c = tal_fmt(parent, take(c), "there");
ok1(strcmp(c, "hello there") == 0);
ok1(tal_parent(c) == parent);
/* No leftover allocations. */
......@@ -41,7 +41,7 @@ int main(void)
c = NULL;
ok1(tal_strdup(NULL, take(c)) == NULL);
ok1(tal_strndup(NULL, take(c), 5) == NULL);
ok1(tal_asprintf(NULL, take(c), 0) == NULL);
ok1(tal_fmt(NULL, take(c), 0) == NULL);
return exit_status();
}
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