Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83ce7555 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Fix install.h's use of attribute printf. 

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

Change-Id: I40b4424f4fd7bd8076e0eee3ec35de36c3ded8de
parent a49c8a19

updater/install.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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;

updater/install.h

+2 −2
Original line number Diff line number Diff line
@@ -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