Merge \"Fix install.h\'s use of attribute printf.\"

am: a82ee456bb

Change-Id: Ibcfabbb0e044d503f889f1afea271cf73ad93f45
This commit is contained in:
Elliott Hughes 2016-06-30 18:18:40 +00:00 committed by android-build-merger
commit 691db7ba77
2 changed files with 3 additions and 4 deletions

View file

@ -80,8 +80,7 @@ static void uiPrint(State* state, const std::string& buffer) {
fprintf(stderr, "%s", buffer.c_str());
}
__attribute__((__format__(printf, 2, 3))) __nonnull((2))
void uiPrintf(State* state, const char* format, ...) {
void uiPrintf(State* _Nonnull state, const char* _Nonnull format, ...) {
std::string error_msg;
va_list ap;

View file

@ -20,8 +20,8 @@
void RegisterInstallFunctions();
// 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