Merge \\\"Fix install.h\\\'s use of attribute printf.\\\" am: a82ee456bb am: 691db7ba77

am: 7c4a34195f

Change-Id: I82d801da1ce7507efe6bb22edb39c28a17b168c0
This commit is contained in:
Elliott Hughes
2016-06-30 18:25:47 +00:00
committed by android-build-merger
2 changed files with 3 additions and 4 deletions
+1 -2
View File
@@ -80,8 +80,7 @@ static void uiPrint(State* state, const std::string& buffer) {
fprintf(stderr, "%s", buffer.c_str()); fprintf(stderr, "%s", buffer.c_str());
} }
__attribute__((__format__(printf, 2, 3))) __nonnull((2)) void uiPrintf(State* _Nonnull state, const char* _Nonnull format, ...) {
void uiPrintf(State* state, const char* format, ...) {
std::string error_msg; std::string error_msg;
va_list ap; va_list ap;
+2 -2
View File
@@ -20,8 +20,8 @@
void RegisterInstallFunctions(); void RegisterInstallFunctions();
// uiPrintf function prints msg to screen as well as logs // uiPrintf function prints msg to screen as well as logs
void uiPrintf(State* state, const char* format, ...); void uiPrintf(State* _Nonnull state, const char* _Nonnull format, ...) __attribute__((__format__(printf, 2, 3)));
static int make_parents(char* name); static int make_parents(char* _Nonnull name);
#endif #endif