diff options
author | Colin Cross <ccross@android.com> | 2016-09-23 10:06:28 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2016-09-23 11:26:08 -0700 |
commit | e8ffa449fdeb7a97131805c96a7acb35957242af (patch) | |
tree | 0c672db958845b7fc7e1e0c8a4ac2950c2cbc644 /include/cutils | |
parent | 6fc7eaaad0ff6193bb7499899a3e19c6c4660fb5 (diff) | |
download | system_core-e8ffa449fdeb7a97131805c96a7acb35957242af.tar.gz system_core-e8ffa449fdeb7a97131805c96a7acb35957242af.tar.bz2 system_core-e8ffa449fdeb7a97131805c96a7acb35957242af.zip |
Move android_get_control_socket out of line
android_get_control_socket has a warning from the implicit cast from
long to int. The warning was being hidden because cutils/sockets.h was
included with -isystem. Move android_get_control_socket to sockets.cpp,
since we don't want header only dependencies anyways, and fix the
warning with a range check and a static_cast.
Bug: 31492149
Test: m -j <module that uses sockets.h and -Wall>
Change-Id: I1f394ab26d4ec8a7dd0e7907c10416d7f8647624
Diffstat (limited to 'include/cutils')
-rw-r--r-- | include/cutils/sockets.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/include/cutils/sockets.h b/include/cutils/sockets.h index 783bd0bea..a93c8eaa4 100644 --- a/include/cutils/sockets.h +++ b/include/cutils/sockets.h @@ -18,6 +18,7 @@ #define __CUTILS_SOCKETS_H #include <errno.h> +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -51,28 +52,8 @@ extern "C" { * android_get_control_socket - simple helper function to get the file * descriptor of our init-managed Unix domain socket. `name' is the name of the * socket, as given in init.rc. Returns -1 on error. - * - * This is inline and not in libcutils proper because we want to use this in - * third-party daemons with minimal modification. */ -static inline int android_get_control_socket(const char* name) -{ - char key[64]; - snprintf(key, sizeof(key), ANDROID_SOCKET_ENV_PREFIX "%s", name); - - const char* val = getenv(key); - if (!val) { - return -1; - } - - errno = 0; - int fd = strtol(val, NULL, 10); - if (errno) { - return -1; - } - - return fd; -} +int android_get_control_socket(const char* name); /* * See also android.os.LocalSocketAddress.Namespace |