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 am: f7ce609edb

Browse Source 
am: 6e8d9121d4

Change-Id: I72070a855929beb195058a3576fb1dfdf9761322
This commit is contained in:
George Burgess IV
2017-01-26 22:07:08 +00:00
committed by android-build-merger
parent 09801ea6e5 6e8d9121d4
commit f4cbea5f14
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;
}
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) {
char addrstr[INET6_ADDRSTRLEN];