openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am eda16b98: Merge "Kill LOCAL_SOCKET_NAMESPACE." 

* commit 'eda16b98dce3ef4c75b7b46c6acdab2b6970f54a':
  Kill LOCAL_SOCKET_NAMESPACE.
This commit is contained in:
Elliott Hughes 2014-11-22 07:56:37 +00:00 committed by Android Git Automerger
parent f8304929a0 eda16b98dc
commit 88cc0aded6
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcutils/socket_local_client.c
View File

@ -52,7 +52,7 @@ int socket_make_sockaddr_un(const char *name, int namespaceId,
switch (namespaceId) {
case ANDROID_SOCKET_NAMESPACE_ABSTRACT:
#ifdef HAVE_LINUX_LOCAL_SOCKET_NAMESPACE
#if defined(__linux__)
namelen = strlen(name);
// Test with length +1 for the *initial* '\0'.
@ -67,7 +67,7 @@ int socket_make_sockaddr_un(const char *name, int namespaceId,
p_addr->sun_path[0] = 0;
memcpy(p_addr->sun_path + 1, name, namelen);
#else /*HAVE_LINUX_LOCAL_SOCKET_NAMESPACE*/
#else
/* this OS doesn't have the Linux abstract namespace */
namelen = strlen(name) + strlen(FILESYSTEM_SOCKET_PREFIX);
@ -79,7 +79,7 @@ int socket_make_sockaddr_un(const char *name, int namespaceId,
strcpy(p_addr->sun_path, FILESYSTEM_SOCKET_PREFIX);
strcat(p_addr->sun_path, name);
#endif /*HAVE_LINUX_LOCAL_SOCKET_NAMESPACE*/
#endif
break;
case ANDROID_SOCKET_NAMESPACE_RESERVED:

2
libcutils/socket_local_server.c
View File

@ -66,7 +66,7 @@ int socket_local_server_bind(int s, const char *name, int namespaceId)
}
/* basically: if this is a filesystem path, unlink first */
#ifndef HAVE_LINUX_LOCAL_SOCKET_NAMESPACE
#if !defined(__linux__)
if (1) {
#else
if (namespaceId == ANDROID_SOCKET_NAMESPACE_RESERVED

6
liblog/log_read.c
View File

@ -72,7 +72,7 @@ int WEAK socket_make_sockaddr_un(const char *name, int namespaceId,
switch (namespaceId) {
case ANDROID_SOCKET_NAMESPACE_ABSTRACT:
#ifdef HAVE_LINUX_LOCAL_SOCKET_NAMESPACE
#if defined(__linux__)
namelen = strlen(name);
/* Test with length +1 for the *initial* '\0'. */
@ -87,7 +87,7 @@ int WEAK socket_make_sockaddr_un(const char *name, int namespaceId,
p_addr->sun_path[0] = 0;
memcpy(p_addr->sun_path + 1, name, namelen);
#else /*HAVE_LINUX_LOCAL_SOCKET_NAMESPACE*/
#else
/* this OS doesn't have the Linux abstract namespace */
namelen = strlen(name) + strlen(FILESYSTEM_SOCKET_PREFIX);
@ -99,7 +99,7 @@ int WEAK socket_make_sockaddr_un(const char *name, int namespaceId,
strcpy(p_addr->sun_path, FILESYSTEM_SOCKET_PREFIX);
strcat(p_addr->sun_path, name);
#endif /*HAVE_LINUX_LOCAL_SOCKET_NAMESPACE*/
#endif
break;
case ANDROID_SOCKET_NAMESPACE_RESERVED: