commit 76d8779c6fa280f049e96d7627037cd973e3911c
author Juan Lang <juan_lang@yahoo.com> Mon Dec 13 13:21:39 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Dec 13 13:21:39 2004 +0000
tree 386538407a450c30f19e5155b0d14df40aaf0cbc
parent 53b71e464a449557cb5a0deedaf541017c980b00

- use Heap functions rather than libc for mem allocation
- document a bunch of functions

dlls/iphlpapi/ifenum.c

diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c
index aeaebdf..fb251ff 100644
--- a/dlls/iphlpapi/ifenum.c
+++ b/dlls/iphlpapi/ifenum.c
@@ -33,7 +33,6 @@
  * than my current mess would probably be better.
  * FIXME:
  * - I don't support IPv6 addresses here, since SIOCGIFCONF can't return them
- * - the memory interface uses malloc/free; it should be using HeapAlloc instead
  *
  * There are three implemened methods for determining the MAC address of an
  * interface:
@@ -154,9 +153,9 @@
 {
     DeleteCriticalSection(&mapCS);
     if (gNonLoopbackInterfaceMap)
-        free(gNonLoopbackInterfaceMap);
+        HeapFree(GetProcessHeap(), 0, gNonLoopbackInterfaceMap);
     if (gLoopbackInterfaceMap)
-        free(gLoopbackInterfaceMap);
+        HeapFree(GetProcessHeap(), 0, gLoopbackInterfaceMap);
 }
 
 /* Sizes the passed-in map to have enough space for numInterfaces interfaces.
@@ -168,14 +167,16 @@
 {
   if (!map) {
     numInterfaces = max(numInterfaces, INITIAL_INTERFACES_ASSUMED);
-    map = (InterfaceNameMap *)calloc(1, sizeof(InterfaceNameMap) +
+    map = (InterfaceNameMap *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
+     sizeof(InterfaceNameMap) +
      (numInterfaces - 1) * sizeof(InterfaceNameMapEntry));
     if (map)
       map->numAllocated = numInterfaces;
   }
   else {
     if (map->numAllocated < numInterfaces) {
-      map = (InterfaceNameMap *)realloc(map, sizeof(InterfaceNameMap) +
+      map = (InterfaceNameMap *)HeapReAlloc(GetProcessHeap(), 0, map,
+       sizeof(InterfaceNameMap) +
        (numInterfaces - 1) * sizeof(InterfaceNameMapEntry));
       if (map)
         memset(&map->table[map->numAllocated], 0,
@@ -321,9 +322,9 @@
       else
         guessedNumInterfaces *= 2;
       if (ifc.ifc_buf)
-        free(ifc.ifc_buf);
+        HeapFree(GetProcessHeap(), 0, ifc.ifc_buf);
       ifc.ifc_len = sizeof(struct ifreq) * guessedNumInterfaces;
-      ifc.ifc_buf = (char *)malloc(ifc.ifc_len);
+      ifc.ifc_buf = (char *)HeapAlloc(GetProcessHeap(), 0, ifc.ifc_len);
       ret = ioctl(fd, SIOCGIFCONF, &ifc);
     } while (ret == 0 &&
      ifc.ifc_len == (sizeof(struct ifreq) * guessedNumInterfaces));
@@ -336,7 +337,7 @@
     }
 
     if (ifc.ifc_buf)
-      free(ifc.ifc_buf);
+      HeapFree(GetProcessHeap(), 0, ifc.ifc_buf);
     close(fd);
   }
 }
@@ -432,7 +433,7 @@
  
   EnterCriticalSection(&mapCS);
   numInterfaces = getNumInterfaces();
-  ret = (InterfaceIndexTable *)calloc(1,
+  ret = (InterfaceIndexTable *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
    sizeof(InterfaceIndexTable) + (numInterfaces - 1) * sizeof(DWORD));
   if (ret) {
     ret->numAllocated = numInterfaces;
@@ -450,7 +451,7 @@
 
   EnterCriticalSection(&mapCS);
   numInterfaces = getNumNonLoopbackInterfaces();
-  ret = (InterfaceIndexTable *)calloc(1,
+  ret = (InterfaceIndexTable *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
    sizeof(InterfaceIndexTable) + (numInterfaces - 1) * sizeof(DWORD));
   if (ret) {
     ret->numAllocated = numInterfaces;
@@ -719,12 +720,12 @@
   if (sysctl(mib, 6, NULL, &mibLen, NULL, 0) < 0)
     return ERROR_NO_MORE_FILES;
 
-  buf = (u_char *)malloc(mibLen);
+  buf = (u_char *)HeapAlloc(GetProcessHeap(), 0, mibLen);
   if (!buf)
     return ERROR_NOT_ENOUGH_MEMORY;
 
   if (sysctl(mib, 6, buf, &mibLen, NULL, 0) < 0) {
-    free(buf);
+    HeapFree(GetProcessHeap(), 0, buf);
     return ERROR_NO_MORE_FILES;
   }
 
@@ -786,7 +787,7 @@
       ret = NO_ERROR;
     }
   }
-  free(buf);
+  HeapFree(GetProcessHeap(), 0, buf);
   return ret;
 }
 #endif