use putenv instead of setenv for portability

[oweals/gnunet.git] / src / util / os_network.c

diff --git a/src/util/os_network.c b/src/util/os_network.c
index 21376f94c62f6d1ccbc1487a11d30d7bea5d293d..70d143ba1b992982ef09907372378e5723592c22 100644 (file)
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -31,6 +31,10 @@
 #include "gnunet_common.h"
 #include "gnunet_os_lib.h"
 
+
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
+
 /**
  * @brief Enumerate all network interfaces
  *
@@ -135,8 +139,9 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
                 pTable->table[dwIfIdx].dwPhysAddrLen);
 
         snprintf (szEntry, 1000, "%s (%s - %I64u)",
-                  pszIfName ? pszIfName : (char *) pTable->table[dwIfIdx].
-                  bDescr, inet_ntop (AF_INET, &dwIP, dst, INET_ADDRSTRLEN),
+                  pszIfName ? pszIfName : (char *) pTable->
+                  table[dwIfIdx].bDescr, inet_ntop (AF_INET, &dwIP, dst,
+                                                    INET_ADDRSTRLEN),
                   *((unsigned long long *) bPhysAddr));
         szEntry[1000] = 0;
 
@@ -212,8 +217,8 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
     f = popen ("ifconfig -a 2> /dev/null", "r");
   if (!f)
   {
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
-                              GNUNET_ERROR_TYPE_BULK, "popen", "ifconfig");
+    LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
+                       "popen", "ifconfig");
     return;
   }