From 6208358a7c6478c4b0efc7e9616ca2135880e3ce Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Tue, 10 Oct 2017 14:48:32 -0400 Subject: [PATCH] Clear some random compile warnings. I saw a bunch fly by. Here are a few fixes. ssize_t is %zd. Types from stdint.h use PRI* macros from inttypes.h. Finally, use C99 initializers rather than the old GNU extension. Test: make checkbuild Change-Id: I343dfb99984ab826c7641e311e041e859eb61d93 --- tests/cts/net/jni/NativeMultinetworkJni.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/cts/net/jni/NativeMultinetworkJni.c b/tests/cts/net/jni/NativeMultinetworkJni.c index 91565043ec..2fa529191d 100644 --- a/tests/cts/net/jni/NativeMultinetworkJni.c +++ b/tests/cts/net/jni/NativeMultinetworkJni.c @@ -47,7 +47,7 @@ JNIEXPORT jint Java_android_net_cts_MultinetworkApiTest_runGetaddrinfoCheck( const int saved_errno = errno; freeaddrinfo(res); - ALOGD("android_getaddrinfofornetwork(%llu, %s) returned rval=%d errno=%d", + ALOGD("android_getaddrinfofornetwork(%" PRIu64 ", %s) returned rval=%d errno=%d", handle, kHostname, rval, saved_errno); return rval == 0 ? 0 : -saved_errno; } @@ -61,7 +61,7 @@ JNIEXPORT jint Java_android_net_cts_MultinetworkApiTest_runSetprocnetwork( errno = 0; int rval = android_setprocnetwork(handle); const int saved_errno = errno; - ALOGD("android_setprocnetwork(%llu) returned rval=%d errno=%d", + ALOGD("android_setprocnetwork(%" PRIu64 ") returned rval=%d errno=%d", handle, rval, saved_errno); return rval == 0 ? 0 : -saved_errno; } @@ -82,7 +82,7 @@ JNIEXPORT jint Java_android_net_cts_MultinetworkApiTest_runSetsocknetwork( errno = 0; int rval = android_setsocknetwork(handle, fd); const int saved_errno = errno; - ALOGD("android_setprocnetwork(%llu, %d) returned rval=%d errno=%d", + ALOGD("android_setprocnetwork(%" PRIu64 ", %d) returned rval=%d errno=%d", handle, fd, rval, saved_errno); close(fd); return rval == 0 ? 0 : -saved_errno;