tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[utils] char_array_add_vjoined to stay consistent (add_* methods NUL termiante)

Browse Source
This commit is contained in:
Al
2017-01-09 14:42:36 -05:00
parent a2b84a0177
commit 953a26e54e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/features.c
View File

@@ -12,7 +12,7 @@ void feature_array_add(cstring_array *features, size_t count, ...) {
cstring_array_start_token(features); cstring_array_start_token(features);
bool strip_separator = true; bool strip_separator = true;
char_array_append_vjoined(features->str, FEATURE_SEPARATOR_CHAR, strip_separator, count, args); char_array_add_vjoined(features->str, FEATURE_SEPARATOR_CHAR, strip_separator, count, args);
va_end(args); va_end(args);
} }

6
src/string_utils.c
View File

@@ -595,7 +595,7 @@ inline void char_array_add_len(char_array *array, char *str, size_t len) {
} }
void char_array_append_vjoined(char_array *array, char *separator, bool strip_separator, int count, va_list args) { void char_array_add_vjoined(char_array *array, char *separator, bool strip_separator, int count, va_list args) {
if (count <= 0) { if (count <= 0) {
return; return;
} }
@@ -625,7 +625,7 @@ void char_array_append_vjoined(char_array *array, char *separator, bool strip_se
inline void char_array_add_joined(char_array *array, char *separator, bool strip_separator, int count, ...) { inline void char_array_add_joined(char_array *array, char *separator, bool strip_separator, int count, ...) {
va_list args; va_list args;
va_start(args, count); va_start(args, count);
char_array_append_vjoined(array, separator, strip_separator, count, args); char_array_add_vjoined(array, separator, strip_separator, count, args);
va_end(args); va_end(args);
} }
@@ -633,7 +633,7 @@ inline void char_array_cat_joined(char_array *array, char *separator, bool strip
char_array_strip_nul_byte(array); char_array_strip_nul_byte(array);
va_list args; va_list args;
va_start(args, count); va_start(args, count);
char_array_append_vjoined(array, separator, strip_separator, count, args); char_array_add_vjoined(array, separator, strip_separator, count, args);
va_end(args); va_end(args);
} }

2
src/string_utils.h
View File

@@ -136,7 +136,7 @@ void char_array_cat_vprintf(char_array *array, char *format, va_list args);
void char_array_cat_printf(char_array *array, char *format, ...); void char_array_cat_printf(char_array *array, char *format, ...);
// Mainly for paths or delimited strings // Mainly for paths or delimited strings
void char_array_append_vjoined(char_array *array, char *separator, bool strip_separator, int count, va_list args); void char_array_add_vjoined(char_array *array, char *separator, bool strip_separator, int count, va_list args);
void char_array_add_joined(char_array *array, char *separator, bool strip_separator, int count, ...); void char_array_add_joined(char_array *array, char *separator, bool strip_separator, int count, ...);
void char_array_cat_joined(char_array *array, char *separator, bool strip_separator, int count, ...); void char_array_cat_joined(char_array *array, char *separator, bool strip_separator, int count, ...);