summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-06-30 20:25:47 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-06-30 20:25:47 +0200
commit937ca850ecda287872e36c8a75b8c035d407d44d (patch)
tree635ef931a8b8d944632777d4e901ba94521640a5
parentMerge \\\"Fix google-explicit-constructor warnings in bootable/recovery.\\\" am: a9f648f010 am: 8e6e4bc979 (diff)
parentMerge \\"Fix install.h\\'s use of attribute printf.\\" am: a82ee456bb (diff)
downloadandroid_bootable_recovery-937ca850ecda287872e36c8a75b8c035d407d44d.tar
android_bootable_recovery-937ca850ecda287872e36c8a75b8c035d407d44d.tar.gz
android_bootable_recovery-937ca850ecda287872e36c8a75b8c035d407d44d.tar.bz2
android_bootable_recovery-937ca850ecda287872e36c8a75b8c035d407d44d.tar.lz
android_bootable_recovery-937ca850ecda287872e36c8a75b8c035d407d44d.tar.xz
android_bootable_recovery-937ca850ecda287872e36c8a75b8c035d407d44d.tar.zst
android_bootable_recovery-937ca850ecda287872e36c8a75b8c035d407d44d.zip
-rw-r--r--updater/install.cpp3
-rw-r--r--updater/install.h4
2 files changed, 3 insertions, 4 deletions
diff --git a/updater/install.cpp b/updater/install.cpp
index cf3e938a4..4c4886d51 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 70e343404..b3b8a4dd5 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