Index: native_client_sdk/src/libraries/nacl_io/syscalls/inet_ntoa.c |
diff --git a/native_client_sdk/src/libraries/nacl_io/syscalls/inet_ntoa.cc b/native_client_sdk/src/libraries/nacl_io/syscalls/inet_ntoa.c |
similarity index 71% |
rename from native_client_sdk/src/libraries/nacl_io/syscalls/inet_ntoa.cc |
rename to native_client_sdk/src/libraries/nacl_io/syscalls/inet_ntoa.c |
index c6cf6107dff4d74cf0dbeddf95d7bfb0148ab68e..dc9e177f05b73dd7ddf3709d125214c29dd26e0e 100644 |
--- a/native_client_sdk/src/libraries/nacl_io/syscalls/inet_ntoa.cc |
+++ b/native_client_sdk/src/libraries/nacl_io/syscalls/inet_ntoa.c |
@@ -3,26 +3,21 @@ |
// found in the LICENSE file. |
#include "nacl_io/ossocket.h" |
-#if defined(PROVIDES_SOCKET_API) && !defined(__GLIBC__) |
-#include <string.h> |
-#include "sdk_util/macros.h" |
+#if defined(PROVIDES_SOCKET_API) && !defined(__GLIBC__) |
static uint8_t GetByte(const void* addr, int byte) { |
- const char* buf = static_cast<const char*>(addr); |
- return static_cast<uint8_t>(buf[byte]); |
+ const char* buf = (const char*)addr; |
+ return (uint8_t)buf[byte]; |
} |
-EXTERN_C_BEGIN |
char* inet_ntoa(struct in_addr in) { |
static char addr[INET_ADDRSTRLEN]; |
- snprintf(addr, INET_ADDRSTRLEN, "%u.%u.%u.%u", |
+ snprintf(addr, INET_ADDRSTRLEN, "%hhu.%hhu.%hhu.%hhu", |
binji
2014/01/27 19:57:18
does it matter? GetByte already returns uint8_t. I
Sam Clegg
2014/01/27 23:10:15
Done.
|
GetByte(&in, 0), GetByte(&in, 1), |
GetByte(&in, 2), GetByte(&in, 3)); |
return addr; |
} |
-EXTERN_C_END |
- |
#endif // defined(PROVIDES_SOCKET_API) && !defined(__GLIBC__) |