mirror/stedolan-jq
1
0
Fork 0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00
Code Issues Releases Activity

Add jv_string_vfmt()

Browse Source
This commit is contained in:
Nicolas Williams
2013-12-04 18:14:10 -06:00
parent 09104ce531
commit 04bc2ef7cf
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jv.c
View File

@@ -774,14 +774,14 @@ jv jv_string_append_str(jv a, const char* str) {
return jv_string_append_buf(a, str, strlen(str)); return jv_string_append_buf(a, str, strlen(str));
} }
jv jv_string_fmt(const char* fmt, ...) { jv jv_string_vfmt(const char* fmt, va_list ap) {
int size = 1024; int size = 1024;
while (1) { while (1) {
char* buf = jv_mem_alloc(size); char* buf = jv_mem_alloc(size);
va_list args; va_list ap2;
va_start(args, fmt); va_copy(ap2, ap);
int n = vsnprintf(buf, size, fmt, args); int n = vsnprintf(buf, size, fmt, ap2);
va_end(args); va_end(ap2);
if (n < size) { if (n < size) {
jv ret = jv_string_sized(buf, n); jv ret = jv_string_sized(buf, n);
jv_mem_free(buf); jv_mem_free(buf);
@@ -793,6 +793,14 @@ jv jv_string_fmt(const char* fmt, ...) {
} }
} }
jv jv_string_fmt(const char* fmt, ...) {
va_list args;
va_start(args, fmt);
jv res = jv_string_vfmt(fmt, args);
va_end(args);
return res;
}
/* /*
* Objects (internal helpers) * Objects (internal helpers)
*/ */

2
jv.h
View File

@@ -1,6 +1,7 @@
#ifndef JV_H #ifndef JV_H
#define JV_H #define JV_H
#include <stdarg.h>
#include <stdint.h> #include <stdint.h>
typedef enum { typedef enum {
@@ -84,6 +85,7 @@ unsigned long jv_string_hash(jv);
const char* jv_string_value(jv); const char* jv_string_value(jv);
jv jv_string_slice(jv j, int start, int end); jv jv_string_slice(jv j, int start, int end);
jv jv_string_concat(jv, jv); jv jv_string_concat(jv, jv);
jv jv_string_vfmt(const char*, va_list);
jv jv_string_fmt(const char*, ...); jv jv_string_fmt(const char*, ...);
jv jv_string_append_codepoint(jv a, uint32_t c); jv jv_string_append_codepoint(jv a, uint32_t c);
jv jv_string_append_buf(jv a, const char* buf, int len); jv jv_string_append_buf(jv a, const char* buf, int len);