From 345c7b764f0721e9bbc993a3cd7f803fd42cf943 Mon Sep 17 00:00:00 2001 From: open-license-manager <rillf@maildrop.cc> Date: 周一, 15 9月 2014 06:58:38 +0800 Subject: [PATCH] moving files for refactoring --- src/library/os/linux/os-linux.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/library/os/linux/os-linux.c b/src/library/os/linux/os-linux.c index f2f30b4..c394891 100644 --- a/src/library/os/linux/os-linux.c +++ b/src/library/os/linux/os-linux.c @@ -34,6 +34,7 @@ #include <dbus-1.0/dbus/dbus.h> #include <sys/utsname.h> + static int ifname_position(char *ifnames, char * ifname, int ifnames_max) { int i, position; position = -1; @@ -47,7 +48,7 @@ } -FUNCTION_RETURN getAdapterInfos(AdapterInfo * adapterInfos, +FUNCTION_RETURN getAdapterInfos(OsAdapterInfo * adapterInfos, size_t * adapter_info_size) { FUNCTION_RETURN f_return = FUNC_RET_OK; @@ -63,7 +64,7 @@ } if (adapterInfos != NULL) { - memset(adapterInfos, 0, (*adapter_info_size) * sizeof(AdapterInfo)); + memset(adapterInfos, 0, (*adapter_info_size) * sizeof(OsAdapterInfo)); } /* count the maximum number of interfaces */ @@ -116,7 +117,7 @@ sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); - */ + #ifdef _DEBUG s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host, NI_MAXHOST, @@ -126,7 +127,7 @@ } printf("\t\taddress: <%s>\n", host); #endif - +*/ if (adapterInfos != NULL && if_name_position < *adapter_info_size) { struct sockaddr_in *s1 = (struct sockaddr_in*) ifa->ifa_addr; in_addr_t iaddr = s1->sin_addr.s_addr; -- Gitblit v1.9.1