nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix printf checking of print_string utility functions.

This commit is contained in:
Jonas 'Sortie' Termansen 2015-06-26 22:56:58 +02:00
parent e001dca46b
commit 53f20c5519
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
init/init.c++
View File

@ -62,9 +62,10 @@ char* read_single_line(FILE* fp)
return ret; return ret;
} }
__attribute__((format(printf, 1, 2)))
char* print_string(const char* format, ...) char* print_string(const char* format, ...)
{ {
char* ret = NULL; char* ret;
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
int status = vasprintf(&ret, format, ap); int status = vasprintf(&ret, format, ap);

1
tix/util.h
View File

@ -369,6 +369,7 @@ bool dictionary_append_file_path(string_array_t* sa, const char* path)
return true; return true;
} }
__attribute__((format(printf, 1, 2)))
char* print_string(const char* format, ...) char* print_string(const char* format, ...)
{ {
va_list ap; va_list ap;

6
trianglix/trianglix.cpp
View File

@ -60,12 +60,14 @@ bool use_runes = false;
bool configured_use_runes = false; bool configured_use_runes = false;
uint8_t font[FONT_CHARSIZE * FONT_NUMCHARS]; uint8_t font[FONT_CHARSIZE * FONT_NUMCHARS];
__attribute__((format(printf, 1, 2)))
char* print_string(const char* format, ...) char* print_string(const char* format, ...)
{ {
char* ret = NULL; char* ret;
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
vasprintf(&ret, format, ap); if ( vasprintf(&ret, format, ap) < 0 )
ret = NULL;
va_end(ap); va_end(ap);
return ret; return ret;
} }