Use wqalloc for dirit

f619c7ea · Silas Boyd-Wickizer · 323d260b · f619c7ea · f619c7ea · f619c7ea
--- a/bin/xls.cc
+++ b/bin/xls.cc
@@ -22,8 +22,8 @@
 #include "user.h"
 #include "fs.h"
 #include "lib.h"
-#include "dirit.hh"
 #include "wq.hh"
+#include "dirit.hh"
 #define ST_SIZE(st)  (st).size
 #define ST_TYPE(st)  (st).type
 #define ST_INO(st)   (st).ino

--- a/include/dirit.hh
+++ b/include/dirit.hh
@@ -44,12 +44,12 @@ private:
 static inline const char*
 copy_value(dirit &it)
 {
-  char *buf = (char*)malloc(256);
-  return it.name(buf, 256);
+  char *buf = (char*)wqalloc(DIRSIZ+1);
+  return it.name(buf, DIRSIZ+1);
 }

 static inline void
 free_value(dirit &it, const char *name)
 {
-  free((void*)name);
+  wqfree((void*)name);
 }
--- a/include/wq.hh
+++ b/include/wq.hh
@@ -38,10 +38,10 @@ struct cwork : public work {
 #define xallocwork(n)    kmalloc(n, "xallocwork")
 #define xfreework(p, sz) kmfree(p, sz)
 #else
-extern void* allocwork(unsigned long nbytes);
-extern void  freework(void *ptr);
-#define xallocwork(n)    allocwork(n)
-#define xfreework(n, sz) freework(n)
+extern void* wqalloc(unsigned long nbytes);
+extern void  wqfree(void *ptr);
+#define xallocwork(n)    wqalloc(n)
+#define xfreework(n, sz) wqfree(n)
 #endif

 #include "wqfor.hh"
--- a/lib/wqalloc.cc
+++ b/lib/wqalloc.cc
@@ -30,7 +30,7 @@ refill(void)
 }

 void*
-allocwork(unsigned long nbytes)
+wqalloc(unsigned long nbytes)
 {
  assert(nbytes <= WQBLOCKSZ);

@@ -44,7 +44,7 @@ allocwork(unsigned long nbytes)
 }

 void
-freework(void *ptr)
+wqfree(void *ptr)
 {
  wqblock* b = (wqblock*) ptr;
  b->next = *block;