felix/ftb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added explicit vararg version

Browse Source
This commit is contained in:
FelixBrendel
2020-05-20 23:15:42 +02:00
parent fcc64d84a2
commit dc98c61901
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
print.hpp
+28 -5
View File
@@ -275,7 +275,7 @@ int maybe_fprintf(FILE* file, static_string format, int* pos, va_list* arg_list)
} }
int vafprint(FILE* file, static_string format, va_list* arg_list) { int print_va_args_to_file(FILE* file, static_string format, va_list* arg_list) {
int printed_chars = 0; int printed_chars = 0;
char c; char c;
@@ -302,6 +302,29 @@ int vafprint(FILE* file, static_string format, va_list* arg_list) {
return printed_chars; return printed_chars;
} }
int print_va_args_to_string(char** out, static_string format, va_list* arg_list) {
FILE* t_file = tmpfile();
if (!t_file) {
return 0;
}
int num_printed_chars = print_va_args_to_file(t_file, format, arg_list);
*out = (char*)malloc(sizeof(char) * (num_printed_chars+1));
rewind(t_file);
fread(*out, sizeof(char), num_printed_chars, t_file);
(*out)[num_printed_chars] = '\0';
fclose(t_file);
return num_printed_chars;
}
int print_va_args(static_string format, va_list* arg_list) {
return print_va_args_to_file(stdout, format, arg_list);
}
int print_to_string(char** out, static_string format, ...) { int print_to_string(char** out, static_string format, ...) {
va_list arg_list; va_list arg_list;
va_start(arg_list, format); va_start(arg_list, format);
@@ -311,14 +334,14 @@ int print_to_string(char** out, static_string format, ...) {
return 0; return 0;
} }
int num_printed_chars = vafprint(t_file, format, &arg_list); int num_printed_chars = print_va_args_to_file(t_file, format, &arg_list);
va_end(arg_list); va_end(arg_list);
*out = (char*)malloc(sizeof(char) * (num_printed_chars+1)); *out = (char*)malloc(sizeof(char) * (num_printed_chars+1));
rewind(t_file); rewind(t_file);
size_t newLen = fread(*out, sizeof(char), num_printed_chars, t_file); fread(*out, sizeof(char), num_printed_chars, t_file);
(*out)[num_printed_chars] = '\0'; (*out)[num_printed_chars] = '\0';
fclose(t_file); fclose(t_file);
@@ -330,7 +353,7 @@ int print_to_file(FILE* file, static_string format, ...) {
va_list arg_list; va_list arg_list;
va_start(arg_list, format); va_start(arg_list, format);
int num_printed_chars = vafprint(file, format, &arg_list); int num_printed_chars = print_va_args_to_file(file, format, &arg_list);
va_end(arg_list); va_end(arg_list);
@@ -341,7 +364,7 @@ int print(static_string format, ...) {
va_list arg_list; va_list arg_list;
va_start(arg_list, format); va_start(arg_list, format);
int num_printed_chars = vafprint(stdout, format, &arg_list); int num_printed_chars = print_va_args_to_file(stdout, format, &arg_list);
va_end(arg_list); va_end(arg_list);