ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "cutils: update property_get to use diagnose_if." am: 5c655991f5

Browse source 
am: f5a677a7d3

Change-Id: I39671d3f090f605d2f9ba3636c342ab5ee46c6bc
This commit is contained in:
George Burgess IV 2017-08-03 02:28:23 +00:00 • committed by android-build-merger
commit 2bf647ae24
1 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libcutils/include/cutils/properties.h
View file

@ -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) __clang_error_if(__bos(value) != __BIONIC_FORTIFY_UNKNOWN_SIZE &&
__overloadable __bos(value) < PROPERTY_VALUE_MAX,
__enable_if(__bos(value) != __BIONIC_FORTIFY_UNKNOWN_SIZE && __property_get_err_str);
__bos(value) < PROPERTY_VALUE_MAX, __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 *)