diff options
| author | Elliott Hughes <enh@google.com> | 2016-06-30 18:25:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-30 18:25:47 +0000 |
| commit | 937ca850ecda287872e36c8a75b8c035d407d44d (patch) | |
| tree | 635ef931a8b8d944632777d4e901ba94521640a5 | |
| parent | 34edfe173e5597cee1b1226a1225386e31690b4c (diff) | |
| parent | 7c4a34195f8c3c0f7218876b0c8ea0883d324972 (diff) | |
| download | android_bootable_recovery-937ca850ecda287872e36c8a75b8c035d407d44d.tar.gz android_bootable_recovery-937ca850ecda287872e36c8a75b8c035d407d44d.tar.bz2 android_bootable_recovery-937ca850ecda287872e36c8a75b8c035d407d44d.zip | |
Merge \\\"Fix install.h\\\'s use of attribute printf.\\\" am: a82ee456bb am: 691db7ba77
am: 7c4a34195f
Change-Id: I82d801da1ce7507efe6bb22edb39c28a17b168c0
| -rw-r--r-- | updater/install.cpp | 3 | ||||
| -rw-r--r-- | updater/install.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/updater/install.cpp b/updater/install.cpp index cf3e938a..4c4886d5 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -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; diff --git a/updater/install.h b/updater/install.h index 70e34340..b3b8a4dd 100644 --- a/updater/install.h +++ b/updater/install.h @@ -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 |