From 83ce7555183a9aa5bac6ccb82d3fa56447d22345 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Thu, 30 Jun 2016 09:28:42 -0700
Subject: [PATCH] Fix install.h's use of attribute printf.

And move off the bionic __nonnull macro, which I'm removing.

Change-Id: I40b4424f4fd7bd8076e0eee3ec35de36c3ded8de
---
 updater/install.cpp | 3 +--
 updater/install.h   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/updater/install.cpp b/updater/install.cpp
index 11d5215c..3e7e9285 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -79,8 +79,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