tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Use inline keyword without underscores consistently"" into main am: d47975728d

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3086365

Change-Id: Ia8a10653b3420d9b094a4cd3688bc0358a034fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-05-15 00:37:12 +00:00 committed by Automerger Merge Worker
commit 397f74e4e8
16 changed files with 37 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libc/bionic/sys_statvfs.cpp
View file

@ -17,7 +17,7 @@
#include <sys/statfs.h>
#include <sys/statvfs.h>
static inline void __bionic_statfs_to_statvfs(const struct statfs* src, struct statvfs* dst) {
static __inline void __bionic_statfs_to_statvfs(const struct statfs* src, struct statvfs* dst) {
dst->f_bsize = src->f_bsize;
dst->f_frsize = src->f_frsize;
dst->f_blocks = src->f_blocks;

22
libc/dns/resolv/res_cache.c
View file

@ -1166,23 +1166,19 @@ entry_free( Entry* e )
}
}
static inline void
entry_mru_remove( Entry* e )
{
e->mru_prev->mru_next = e->mru_next;
e->mru_next->mru_prev = e->mru_prev;
static __inline__ void entry_mru_remove(Entry* e) {
e->mru_prev->mru_next = e->mru_next;
e->mru_next->mru_prev = e->mru_prev;
}
static inline void
entry_mru_add( Entry* e, Entry* list )
{
Entry* first = list->mru_next;
static __inline__ void entry_mru_add(Entry* e, Entry* list) {
Entry* first = list->mru_next;
e->mru_next = first;
e->mru_prev = list;
e->mru_next = first;
e->mru_prev = list;
list->mru_next = e;
first->mru_prev = e;
list->mru_next = e;
first->mru_prev = e;
}
/* compute the hash of a given entry, this is a hash of most

2
libc/include/android/api-level.h
View file

@ -191,7 +191,7 @@ int android_get_application_target_sdk_version() __INTRODUCED_IN(24);
#if __ANDROID_API__ < 29
/* android_get_device_api_level is a static inline before API level 29. */
#define __BIONIC_GET_DEVICE_API_LEVEL_INLINE static inline
#define __BIONIC_GET_DEVICE_API_LEVEL_INLINE static __inline
#include <bits/get_device_api_level_inlines.h>
#undef __BIONIC_GET_DEVICE_API_LEVEL_INLINE

6
libc/include/android/legacy_stdlib_inlines.h
View file

@ -38,15 +38,15 @@
__BEGIN_DECLS
static inline double strtod_l(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr, locale_t _Nonnull __l) {
static __inline double strtod_l(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr, locale_t _Nonnull __l) {
return strtod(__s, __end_ptr);
}
static inline float strtof_l(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr, locale_t _Nonnull __l) {
static __inline float strtof_l(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr, locale_t _Nonnull __l) {
return strtof(__s, __end_ptr);
}
static inline long strtol_l(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr, int __base, locale_t _Nonnull __l) {
static __inline long strtol_l(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr, int __base, locale_t _Nonnull __l) {
return strtol(__s, __end_ptr, __base);
}

4
libc/include/android/legacy_termios_inlines.h
View file

@ -39,14 +39,14 @@
#include <sys/ioctl.h>
#include <sys/types.h>
#define __BIONIC_TERMIOS_INLINE static inline
#define __BIONIC_TERMIOS_INLINE static __inline
#include <bits/termios_inlines.h>
#endif
#if __ANDROID_API__ < 35
#define __BIONIC_TERMIOS_WINSIZE_INLINE static inline
#define __BIONIC_TERMIOS_WINSIZE_INLINE static __inline
#include <bits/termios_winsize_inlines.h>
#endif

2
libc/include/android/legacy_threads_inlines.h
View file

@ -32,7 +32,7 @@
#if __ANDROID_API__ < 30
#define __BIONIC_THREADS_INLINE static inline
#define __BIONIC_THREADS_INLINE static __inline
#include <bits/threads_inlines.h>
#endif

2
libc/include/android/legacy_unistd_inlines.h
View file

@ -32,7 +32,7 @@
#if __ANDROID_API__ < 28
#define __BIONIC_SWAB_INLINE static inline
#define __BIONIC_SWAB_INLINE static __inline
#include <bits/swab.h>
#endif

12
libc/include/bits/stdatomic.h
View file

@ -138,11 +138,11 @@ typedef enum {
* 7.17.4 Fences.
*/
static inline void atomic_thread_fence(memory_order __order __attribute__((__unused__))) {
static __inline void atomic_thread_fence(memory_order __order __attribute__((__unused__))) {
__c11_atomic_thread_fence(__order);
}
static inline void atomic_signal_fence(memory_order __order __attribute__((__unused__))) {
static __inline void atomic_signal_fence(memory_order __order __attribute__((__unused__))) {
__c11_atomic_signal_fence(__order);
}
@ -269,18 +269,18 @@ typedef struct {
#define ATOMIC_FLAG_INIT { ATOMIC_VAR_INIT(false) }
static inline bool atomic_flag_test_and_set_explicit(volatile atomic_flag * _Nonnull __object, memory_order __order) {
static __inline bool atomic_flag_test_and_set_explicit(volatile atomic_flag * _Nonnull __object, memory_order __order) {
return (atomic_exchange_explicit(&__object->__flag, 1, __order));
}
static inline void atomic_flag_clear_explicit(volatile atomic_flag * _Nonnull __object, memory_order __order) {
static __inline void atomic_flag_clear_explicit(volatile atomic_flag * _Nonnull __object, memory_order __order) {
atomic_store_explicit(&__object->__flag, 0, __order);
}
static inline bool atomic_flag_test_and_set(volatile atomic_flag * _Nonnull __object) {
static __inline bool atomic_flag_test_and_set(volatile atomic_flag * _Nonnull __object) {
return (atomic_flag_test_and_set_explicit(__object, memory_order_seq_cst));
}
static inline void atomic_flag_clear(volatile atomic_flag * _Nonnull __object) {
static __inline void atomic_flag_clear(volatile atomic_flag * _Nonnull __object) {
atomic_flag_clear_explicit(__object, memory_order_seq_cst);
}

2
libc/include/bits/swab.h
View file

@ -33,7 +33,7 @@
#include <sys/types.h>
#if !defined(__BIONIC_SWAB_INLINE)
#define __BIONIC_SWAB_INLINE static inline
#define __BIONIC_SWAB_INLINE static __inline
#endif
__BEGIN_DECLS

4
libc/include/bits/termios_inlines.h
View file

@ -37,7 +37,7 @@
#include <linux/termios.h>
#if !defined(__BIONIC_TERMIOS_INLINE)
#define __BIONIC_TERMIOS_INLINE static inline
#define __BIONIC_TERMIOS_INLINE static __inline
#endif
__BEGIN_DECLS
@ -45,7 +45,7 @@ __BEGIN_DECLS
// Supporting separate input and output speeds would require an ABI
// change for `struct termios`.
static inline speed_t cfgetspeed(const struct termios* _Nonnull s) {
static __inline speed_t cfgetspeed(const struct termios* _Nonnull s) {
return __BIONIC_CAST(static_cast, speed_t, s->c_cflag & CBAUD);
}

2
libc/include/bits/termios_winsize_inlines.h
View file

@ -36,7 +36,7 @@
#include <linux/termios.h>
#if !defined(__BIONIC_TERMIOS_WINSIZE_INLINE)
#define __BIONIC_TERMIOS_WINSIZE_INLINE static inline
#define __BIONIC_TERMIOS_WINSIZE_INLINE static __inline
#endif
__BEGIN_DECLS

2
libc/include/bits/threads_inlines.h
View file

@ -38,7 +38,7 @@
__BEGIN_DECLS
static inline int __bionic_thrd_error(int __pthread_code) {
static __inline int __bionic_thrd_error(int __pthread_code) {
switch (__pthread_code) {
case 0: return 0;
case ENOMEM: return thrd_nomem;

2
libc/include/ctype.h
View file

@ -42,7 +42,7 @@
* also provide actual symbols for any caller that needs them.
*/
#if !defined(__BIONIC_CTYPE_INLINE)
#define __BIONIC_CTYPE_INLINE static inline
#define __BIONIC_CTYPE_INLINE static __inline
#endif
/** Internal implementation detail. Do not use. */

6
libc/include/strings.h
View file

@ -50,7 +50,7 @@
#include <bits/strcasecmp.h>
#if !defined(__BIONIC_STRINGS_INLINE)
#define __BIONIC_STRINGS_INLINE static inline
#define __BIONIC_STRINGS_INLINE static __inline
#endif
#undef ffs
@ -61,13 +61,13 @@ __BEGIN_DECLS
/** Deprecated. Use memmove() instead. */
#define bcopy(b1, b2, len) __bionic_bcopy((b1), (b2), (len))
static inline __always_inline void __bionic_bcopy(const void* _Nonnull b1, void* _Nonnull b2, size_t len) {
static __inline__ __always_inline void __bionic_bcopy(const void* _Nonnull b1, void* _Nonnull b2, size_t len) {
__builtin_memmove(b2, b1, len);
}
/** Deprecated. Use memset() instead. */
#define bzero(b, len) __bionic_bzero((b), (len))
static inline __always_inline void __bionic_bzero(void* _Nonnull b, size_t len) {
static __inline__ __always_inline void __bionic_bzero(void* _Nonnull b, size_t len) {
__builtin_memset(b, 0, len);
}

4
libc/include/sys/cdefs.h
View file

@ -260,7 +260,7 @@
* them available externally. FORTIFY'ed functions try to be as close to possible as 'invisible';
* having stack protectors detracts from that (b/182948263).
*/
# define __BIONIC_FORTIFY_INLINE static inline __attribute__((__no_stack_protector__)) \
# define __BIONIC_FORTIFY_INLINE static __inline__ __attribute__((__no_stack_protector__)) \
__always_inline __VERSIONER_FORTIFY_INLINE
/*
* We should use __BIONIC_FORTIFY_VARIADIC instead of __BIONIC_FORTIFY_INLINE
@ -268,7 +268,7 @@
* The __always_inline attribute is useless, misleading, and could trigger
* clang compiler bug to incorrectly inline variadic functions.
*/
# define __BIONIC_FORTIFY_VARIADIC static inline
# define __BIONIC_FORTIFY_VARIADIC static __inline__
/* Error functions don't have bodies, so they can just be static. */
# define __BIONIC_ERROR_FUNCTION_VISIBILITY static __attribute__((__unused__))
#else

4
libc/kernel/tools/cpp.py
View file

@ -2345,11 +2345,11 @@ struct something_s {
def test_function_keep_attribute_structs(self):
text = """\
static inline struct some_struct1 * function(struct some_struct2 * e) {
static __inline__ struct some_struct1 * function(struct some_struct2 * e) {
}
"""
expected = """\
static inline struct some_struct1 * function(struct some_struct2 * e) {
static __inline__ struct some_struct1 * function(struct some_struct2 * e) {
}
"""
self.assertEqual(self.parse(text, set(["function"])), expected)