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

Commit 9bf11c1d authored by George Burgess IV's avatar George Burgess IV
Browse files

cutils: update property_get to use diagnose_if. 

This lets us redeclare property_get with diagnose_if tagged on it,
so we no longer need to deal with overloads.

Bug: 12231437
Test: m checkbuild on bullhead aosp-master.
Change-Id: Ic55dcfeaa314f83d3713aabac7852cb766330fc8
parent ceb7814c

libcutils/include/cutils/properties.h

+6 −23
Original line number Original line Diff line number Diff line
@@ -43,12 +43,7 @@ extern "C" { 
** If the property read fails or returns an empty value, the default

** If the property read fails or returns an empty value, the default

** value is used (if nonnull).

** value is used (if nonnull).

*/

*/

int property_get(const char *key, char *value, const char *default_value)

int property_get(const char* key, char* value, const char* default_value);

/* Sometimes we use not-Bionic with this, so we need this check. */

#if defined(__BIONIC_FORTIFY)

        __overloadable __RENAME_CLANG(property_get)

#endif

        ;





/* property_get_bool: returns the value of key coerced into a

/* property_get_bool: returns the value of key coerced into a

** boolean. If the property is not set, then the default value is returned.

** boolean. If the property is not set, then the default value is returned.
@@ -119,27 +114,15 @@ int property_list(void (*propfn)(const char *key, const char *value, void *cooki 




#if defined(__clang__)

#if defined(__clang__)





/* Some projects use -Weverything; enable_if is clang-specific.

/* Some projects use -Weverything; diagnose_if is clang-specific. */

** FIXME: This is marked used because we'll otherwise get complaints about an

** unused static function. This is more robust than marking it unused, since

** -Wused-but-marked-unused is a thing that will complain if this function is

** actually used, thus making FORTIFY noisier when an error happens. It's going

** to go away anyway during our FORTIFY cleanup.

**/

#pragma clang diagnostic push

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wgcc-compat"

#pragma clang diagnostic ignored "-Wgcc-compat"

__BIONIC_ERROR_FUNCTION_VISIBILITY

int property_get(const char* key, char* value, const char* default_value)

int property_get(const char* key, char* value, const char* default_value)

        __overloadable

    __clang_error_if(__bos(value) != __BIONIC_FORTIFY_UNKNOWN_SIZE &&

        __enable_if(__bos(value) != __BIONIC_FORTIFY_UNKNOWN_SIZE &&

                         __bos(value) < PROPERTY_VALUE_MAX,

                    __bos(value) < PROPERTY_VALUE_MAX, __property_get_err_str)

                     __property_get_err_str);

        __errorattr(__property_get_err_str)

        __attribute__((used));

#pragma clang diagnostic pop

#pragma clang diagnostic pop





/* No object size? No FORTIFY.

*/



#else /* defined(__clang__) */

#else /* defined(__clang__) */





extern int __property_get_real(const char *, char *, const char *)

extern int __property_get_real(const char *, char *, const char *)