diff -r b8bf95b39952 -r cff9c4101dd7 src/server/daemon/httplistener.c
--- a/src/server/daemon/httplistener.c	Sat Jan 14 13:53:44 2012 +0100
+++ b/src/server/daemon/httplistener.c	Sat Jan 14 14:33:38 2012 +0100
@@ -46,12 +46,12 @@
 #include <stdbool.h>
 #include <pthread.h>
 
-#include "../util/map.h"
+#include "../ucx/map.h"
 #include "httplistener.h"
 
 #include "session.h"
 
-hashmap_t *listener_map = NULL;
+UcxMap *listener_map = NULL;
 
 
 int start_all_listener() {
@@ -62,7 +62,7 @@
 }
 
 HttpListener* get_http_listener(char *name) {
-    return hashmap_get(listener_map, sstr(name));
+    return ucx_map_cstr_get(listener_map, name);
 }
 
 
@@ -105,9 +105,9 @@
     }
 
     if(listener_map == NULL) {
-        listener_map = hashmap_new(8);
+        listener_map = ucx_map_new(8);
     }
-    hashmap_put(listener_map, sstr(conf->name), listener);
+    ucx_map_cstr_put(listener_map, conf->name, listener);
     return listener;
 }