Include stdlib.h rather than malloc.h

diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c
index c88796021f5f11df80b7a42fbc59fd658a901710..ff1fa646a75fc387639563d53c99e3321a2b0b3d 100644 (file)
--- a/src/drivers/net/rtl8139.c
+++ b/src/drivers/net/rtl8139.c
@@ -66,11 +66,12 @@
 
 */
 
+#include <stdint.h>
+#include <stdlib.h>
 #include <io.h>
 #include <errno.h>
 #include <vsprintf.h>
 #include <timer.h>
-#include <malloc.h>
 #include <byteswap.h>
 #include <gpxe/pci.h>
 #include <gpxe/if_ether.h>

diff --git a/src/hci/mucurses/slk.c b/src/hci/mucurses/slk.c
index ca0822882c3e5cfe91dd3ec636dbb0f421650bf2..4422e15a0c3828e850d1868e484dc894651d9f48 100644 (file)
--- a/src/hci/mucurses/slk.c
+++ b/src/hci/mucurses/slk.c
@@ -1,6 +1,6 @@
 #include <curses.h>
 #include <stddef.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include "mucurses.h"

diff --git a/src/hci/mucurses/windows.c b/src/hci/mucurses/windows.c
index c1a3a9315497d56170d3e924597c372c1cd1fe8d..63d0af08c41389f882c7057745c4f7b67f6b2e08 100644 (file)
--- a/src/hci/mucurses/windows.c
+++ b/src/hci/mucurses/windows.c
@@ -1,6 +1,6 @@
 #include <curses.h>
 #include <stddef.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "mucurses.h"
 
 /** @file

diff --git a/src/interface/pxe/pxe_preboot.c b/src/interface/pxe/pxe_preboot.c
index 894ed43652df1811ca76c676acaf8314b0d3cc54..09fa5fef38be64668d15764323103222af919c84 100644 (file)
--- a/src/interface/pxe/pxe_preboot.c
+++ b/src/interface/pxe/pxe_preboot.c
@@ -25,7 +25,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <gpxe/uaccess.h>
 #include <gpxe/dhcp.h>
 #include "pxe.h"

diff --git a/src/net/ipv4.c b/src/net/ipv4.c
index 8a1e8df3ec1b220a5bd2520dea5636593074666f..065bf61c44c9d8a4d77add92f595886430179957 100644 (file)
--- a/src/net/ipv4.c
+++ b/src/net/ipv4.c
@@ -1,8 +1,8 @@
 #include <string.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <malloc.h>
 #include <vsprintf.h>
 #include <gpxe/list.h>
 #include <gpxe/in.h>
@@ -199,9 +199,7 @@ static void ipv4_frag_expired ( struct retry_timer *timer __unused,
  * @v fragbug  Fragment buffer
  */
 static void free_fragbuf ( struct frag_buffer *fragbuf ) {
-       if ( fragbuf ) {
-               free_dma ( fragbuf, sizeof ( *fragbuf ) );
-       }
+       free ( fragbuf );
 }
 
 /**

diff --git a/src/net/ipv6.c b/src/net/ipv6.c
index e38e314aa66e2d7903126a035428d617fd7e76f6..26c43dd0b154e15ba965a46cc700a3429fb95f1c 100644 (file)
--- a/src/net/ipv6.c
+++ b/src/net/ipv6.c
@@ -2,7 +2,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <vsprintf.h>
 #include <byteswap.h>
 #include <gpxe/in.h>