Changeset 5826 for luci2/upsd/core.h

Timestamp:

03/15/10 18:37:17 (3 years ago)

Author:

Cyrus

Message:

upsd: Use libmbox

Files:

• luci2/upsd/core.h (modified) (3 diffs)

luci2/upsd/core.h

@@ -13 +13 @@
     #define UPSD_LOCAL
 #endif
+
+#ifdef UPSD_STANDALONE
+#define UHTBL_API UPSD_LOCAL
+#endif
+
+#include "libmbox/hash.h"
+#include "libmbox/uhtbl.h"
 
 #define UPSD_LENGTHOF(array) (sizeof(array) / sizeof(*array))
@@ -66 +73 @@
 /* Event dataset */
 struct upsd_event {
+    uhtbl_head_t __head;
     uint16_t receiving;
     uint16_t emitting;
@@ -97 +105 @@
 };
 
-
-#include "cbi2/hmap.h"
-
 struct upsd_state {
-    cbi2_hmap_t *events;
+    uhtbl_t events;
     upsd_extension_t *extensions;
     upsd_report_t *report;