generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 63fa660b: Merge "Prefix cmsg_nxthdr with "__"."

Browse Source 
* commit '63fa660b52f1e9717f0a2105d4861a4b48c330b1':
  Prefix cmsg_nxthdr with "__".
This commit is contained in:
Calin Juravle 2014-06-24 11:02:06 +00:00 committed by Android Git Automerger
commit b52d7e7b6e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libc/bionic/cmsg_nxthdr.cpp
View File

@ -28,7 +28,7 @@
#include <sys/socket.h> #include <sys/socket.h>
cmsghdr* cmsg_nxthdr(msghdr* msg, cmsghdr* cmsg) { cmsghdr* __cmsg_nxthdr(msghdr* msg, cmsghdr* cmsg) {
cmsghdr* ptr; cmsghdr* ptr;
ptr = reinterpret_cast<cmsghdr*>(reinterpret_cast<char*>(cmsg) + CMSG_ALIGN(cmsg->cmsg_len)); ptr = reinterpret_cast<cmsghdr*>(reinterpret_cast<char*>(cmsg) + CMSG_ALIGN(cmsg->cmsg_len));
size_t len = reinterpret_cast<char*>(ptr+1) - reinterpret_cast<char*>(msg->msg_control); size_t len = reinterpret_cast<char*>(ptr+1) - reinterpret_cast<char*>(msg->msg_control);
@ -37,3 +37,6 @@ cmsghdr* cmsg_nxthdr(msghdr* msg, cmsghdr* cmsg) {
} }
return ptr; return ptr;
} }
// TODO: remove after NDK refresh.
__weak_alias(cmsg_nxthdr, __cmsg_nxthdr);

4
libc/include/sys/socket.h
View File

@ -107,7 +107,7 @@ struct cmsghdr {
int cmsg_type; int cmsg_type;
}; };
#define CMSG_NXTHDR(mhdr, cmsg) cmsg_nxthdr((mhdr), (cmsg)) #define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr((mhdr), (cmsg))
#define CMSG_ALIGN(len) ( ((len)+sizeof(long)-1) & ~(sizeof(long)-1) ) #define CMSG_ALIGN(len) ( ((len)+sizeof(long)-1) & ~(sizeof(long)-1) )
#define CMSG_DATA(cmsg) ((void*)((char*)(cmsg) + CMSG_ALIGN(sizeof(struct cmsghdr)))) #define CMSG_DATA(cmsg) ((void*)((char*)(cmsg) + CMSG_ALIGN(sizeof(struct cmsghdr))))
#define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr)) + CMSG_ALIGN(len)) #define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr)) + CMSG_ALIGN(len))
@ -117,7 +117,7 @@ struct cmsghdr {
? (struct cmsghdr*) (msg)->msg_control : (struct cmsghdr*) NULL) ? (struct cmsghdr*) (msg)->msg_control : (struct cmsghdr*) NULL)
#define CMSG_OK(mhdr, cmsg) ((cmsg)->cmsg_len >= sizeof(struct cmsghdr) && (cmsg)->cmsg_len <= (unsigned long) ((mhdr)->msg_controllen - ((char*)(cmsg) - (char*)(mhdr)->msg_control))) #define CMSG_OK(mhdr, cmsg) ((cmsg)->cmsg_len >= sizeof(struct cmsghdr) && (cmsg)->cmsg_len <= (unsigned long) ((mhdr)->msg_controllen - ((char*)(cmsg) - (char*)(mhdr)->msg_control)))
struct cmsghdr* cmsg_nxthdr(struct msghdr*, struct cmsghdr*); struct cmsghdr* __cmsg_nxthdr(struct msghdr*, struct cmsghdr*);
#define SCM_RIGHTS 0x01 #define SCM_RIGHTS 0x01
#define SCM_CREDENTIALS 0x02 #define SCM_CREDENTIALS 0x02