X-Git-Url: https://git.distorted.org.uk/~mdw/become/blobdiff_plain/8cdc1da9ae4f92816de7e7d95c2c1386cec82f95..4c37c6af624a9d4dabadac32a5e566d388ee78d7:/src/name.c

diff --git a/src/name.c b/src/name.c
index 6599d45..cc9d98f 100644
--- a/src/name.c
+++ b/src/name.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: name.c,v 1.7 1998/04/23 13:23:56 mdw Exp $
+ * $Id: name.c,v 1.9 2003/10/12 00:39:16 mdw Exp $
  *
  * Looking up of names in symbol tables
  *
@@ -29,6 +29,13 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: name.c,v $
+ * Revision 1.9  2003/10/12 00:39:16  mdw
+ * Light fixes for strange building.
+ *
+ * Revision 1.8  2003/10/12 00:14:55  mdw
+ * Major overhaul.  Now uses DSA signatures rather than the bogus symmetric
+ * encrypt-and-hope thing.  Integrated with mLib and Catacomb.
+ *
  * Revision 1.7  1998/04/23 13:23:56  mdw
  * Fix bugs involving empty classes.
  *
@@ -75,6 +82,11 @@
 #include <grp.h>
 #include <pwd.h>
 
+/* --- mLib headers --- */
+
+#include <mLib/alloc.h>
+#include <mLib/sym.h>
+
 /* --- Local headers --- */
 
 #include "config.h"
@@ -83,9 +95,7 @@
 #include "class.h"
 #include "name.h"
 #include "netg.h"
-#include "sym.h"
 #include "userdb.h"
-#include "utils.h"
 
 /*----- Static variables --------------------------------------------------*/
 
@@ -349,7 +359,7 @@ void name_init(void)
 {
   /* --- Initialise the name table --- */
 
-  sym_createTable(&name__table);
+  sym_create(&name__table);
 
   /* --- Add everyone into the table --- */
 
@@ -396,7 +406,7 @@ void name_end(void)
     sym_iter i;
     name *n;
 
-    for (sym_createIter(&i, &name__table); (n = sym_next(&i)) != 0; ) {
+    for (sym_mkiter(&i, &name__table); (n = sym_next(&i)) != 0; ) {
       if (n->c)
 	class_dec(n->c);
     }
@@ -404,7 +414,7 @@ void name_end(void)
 
   /* --- Destroy and recreate the table --- */
 
-  sym_destroyTable(&name__table);
+  sym_destroy(&name__table);
 }
 
 /* --- @name_find@ --- *
@@ -444,7 +454,7 @@ void name_dump(void)
   name *n;
 
   trace(TRACE_DEBUG, "name: dumping names");
-  for (sym_createIter(&i, &name__table); (n = sym_next(&i)) != 0; ) {
+  for (sym_mkiter(&i, &name__table); (n = sym_next(&i)) != 0; ) {
     trace(TRACE_DEBUG, "name: dumping `%s'", n->base.name);
     if (!n->c)
       trace(TRACE_DEBUG, "name:   <empty>");
@@ -461,7 +471,7 @@ void name_dump(void)
 int main(void)
 {
   ego("name-test");
-  traceon(stdout, TRACE_ALL);
+  trace_on(stdout, TRACE_ALL);
   userdb_init();
   userdb_local();
   userdb_yp();