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

Merge "Consistently use 'op' in argument names." into main

Browse source
This commit is contained in:
Elliott Hughes 2024-03-05 15:25:18 +00:00 committed by Gerrit Code Review
commit 47f8ab80cc
10 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,6 +43,6 @@ __BEGIN_DECLS
*
* The return value depends on the operation.
*/
int fcntl(int __fd, int __cmd, ...);
int fcntl(int __fd, int __op, ...);
__END_DECLS

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

@ -40,7 +40,7 @@ __BEGIN_DECLS
/**
* [ioctl(2)](http://man7.org/linux/man-pages/man2/ioctl.2.html) operates on device files.
*/
int ioctl(int __fd, int __request, ...);
int ioctl(int __fd, int __op, ...);
/*
* Work around unsigned -> signed conversion warnings: many common ioctl
@ -57,7 +57,7 @@ int ioctl(int __fd, int __request, ...);
*/
#if !defined(BIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD)
/* enable_if(1) just exists to break overloading ties. */
int ioctl(int __fd, unsigned __request, ...) __overloadable __enable_if(1, "") __RENAME(ioctl);
int ioctl(int __fd, unsigned __op, ...) __overloadable __enable_if(1, "") __RENAME(ioctl);
#endif
__END_DECLS

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

@ -56,12 +56,12 @@ __BEGIN_DECLS
*
* See also flock().
*/
int lockf(int __fd, int __cmd, off_t __length) __RENAME_IF_FILE_OFFSET64(lockf64) __INTRODUCED_IN(24);
int lockf(int __fd, int __op, off_t __length) __RENAME_IF_FILE_OFFSET64(lockf64) __INTRODUCED_IN(24);
/**
* Like lockf() but allows using a 64-bit length
* even from a 32-bit process without `_FILE_OFFSET_BITS=64`.
*/
int lockf64(int __fd, int __cmd, off64_t __length) __INTRODUCED_IN(24);
int lockf64(int __fd, int __op, off64_t __length) __INTRODUCED_IN(24);
__END_DECLS

2
libc/include/sys/msg.h
View file

@ -46,7 +46,7 @@ typedef __kernel_ulong_t msgqnum_t;
typedef __kernel_ulong_t msglen_t;
/** Not useful on Android; disallowed by SELinux. */
int msgctl(int __msg_id, int __cmd, struct msqid_ds* _Nullable __buf) __INTRODUCED_IN(26);
int msgctl(int __msg_id, int __op, struct msqid_ds* _Nullable __buf) __INTRODUCED_IN(26);
/** Not useful on Android; disallowed by SELinux. */
int msgget(key_t __key, int __flags) __INTRODUCED_IN(26);
/** Not useful on Android; disallowed by SELinux. */

2
libc/include/sys/prctl.h
View file

@ -45,6 +45,6 @@ __BEGIN_DECLS
*
* Returns -1 and sets `errno` on failure; success values vary by option.
*/
int prctl(int __option, ...);
int prctl(int __op, ...);
__END_DECLS

2
libc/include/sys/ptrace.h
View file

@ -59,7 +59,7 @@ __BEGIN_DECLS
#define PT_GETSIGINFO PTRACE_GETSIGINFO
#define PT_SETSIGINFO PTRACE_SETSIGINFO
long ptrace(int __request, ...);
long ptrace(int __op, ...);
__END_DECLS

2
libc/include/sys/quota.h
View file

@ -51,6 +51,6 @@ __BEGIN_DECLS
*
* Available since API level 26.
*/
int quotactl(int __cmd, const char* _Nullable __special, int __id, char* __BIONIC_COMPLICATED_NULLNESS __addr) __INTRODUCED_IN(26);
int quotactl(int __op, const char* _Nullable __special, int __id, char* __BIONIC_COMPLICATED_NULLNESS __addr) __INTRODUCED_IN(26);
__END_DECLS

2
libc/include/sys/reboot.h
View file

@ -55,6 +55,6 @@ __BEGIN_DECLS
* Does not return on successful reboot, returns 0 if CAD was successfully enabled/disabled,
* and returns -1 and sets `errno` on failure.
*/
int reboot(int __cmd);
int reboot(int __op);
__END_DECLS

2
libc/include/sys/sem.h
View file

@ -51,7 +51,7 @@ union semun {
void* _Nullable __pad;
};
int semctl(int __sem_id, int __sem_num, int __cmd, ...) __INTRODUCED_IN(26);
int semctl(int __sem_id, int __sem_num, int __op, ...) __INTRODUCED_IN(26);
int semget(key_t __key, int __sem_count, int __flags) __INTRODUCED_IN(26);
int semop(int __sem_id, struct sembuf* _Nonnull __ops, size_t __op_count) __INTRODUCED_IN(26);

2
libc/include/sys/shm.h
View file

@ -49,7 +49,7 @@ typedef unsigned long shmatt_t;
/** Not useful on Android; disallowed by SELinux. */
void* _Nonnull shmat(int __shm_id, const void* _Nullable __addr, int __flags) __INTRODUCED_IN(26);
/** Not useful on Android; disallowed by SELinux. */
int shmctl(int __shm_id, int __cmd, struct shmid_ds* _Nullable __buf) __INTRODUCED_IN(26);
int shmctl(int __shm_id, int __op, struct shmid_ds* _Nullable __buf) __INTRODUCED_IN(26);
/** Not useful on Android; disallowed by SELinux. */
int shmdt(const void* _Nonnull __addr) __INTRODUCED_IN(26);
/** Not useful on Android; disallowed by SELinux. */