LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Replace strlen("foo") with sizeof("foo") - 1." am: a17d71f60a am: 386431a28c

Browse Source 
am: f7ce609edb

Change-Id: Ica1b820deed1f511e1557a6c9d49d8e375b68812
This commit is contained in:
George Burgess IV
2017-01-26 22:03:05 +00:00
committed by android-build-merger
parent 3a504e398d f7ce609edb
commit 6e8d9121d4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cts/net/jni/NativeMultinetworkJni.c
View File

@@ -88,7 +88,9 @@ JNIEXPORT jint Java_android_net_cts_MultinetworkApiTest_runSetsocknetwork(
return rval == 0 ? 0 : -saved_errno; return rval == 0 ? 0 : -saved_errno;
} }
static const int kSockaddrStrLen = INET6_ADDRSTRLEN + strlen("[]:65535"); // Use sizeof("x") - 1 because we need a compile-time constant, and strlen("x")
// isn't guaranteed to fold to a constant.
static const int kSockaddrStrLen = INET6_ADDRSTRLEN + sizeof("[]:65535") - 1;
void sockaddr_ntop(const struct sockaddr *sa, socklen_t salen, char *dst, const size_t size) { void sockaddr_ntop(const struct sockaddr *sa, socklen_t salen, char *dst, const size_t size) {
char addrstr[INET6_ADDRSTRLEN]; char addrstr[INET6_ADDRSTRLEN];