X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=util.h;h=bc23ecd9a6005fce68d6007bec1b6cb016845039;hb=03298d834be19eed7eb1dd70c76a7f1f22a2e93b;hp=005dba623f13dcb878b34cd63331416a93896c76;hpb=f0adaa78963ffc8b870059d5787079fbbd7c52a5;p=wmpus

diff --git a/util.h b/util.h
index 005dba6..bc23ecd 100644
--- a/util.h
+++ b/util.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2011, Andy Spencer <andy753421@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ */
+
+/* Various utility functions */
+
 /* Misc macros */
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -6,17 +23,17 @@
 
 #define countof(x) (sizeof(x)/sizeof((x)[0]))
 
-/* Constant lenght map functitons */
-#define map_getg(map, test) ({ \
-	int i; \
-	for (i = 0; i < countof(map) && !(test); i++); \
-	i < countof(map) ? &map[i] : NULL ; \
+/* Constant length map functions */
+#define map_get(map, k, kv, v, def) ({         \
+	typeof(def) val = def;                 \
+	for (int i = 0; i < countof(map); i++) \
+		if (map[i].k == kv) {          \
+			val = map[i].v;        \
+			break;                 \
+		}                              \
+	val;                                   \
 })
 
-#define map_get(m,k)    map_getg(m,k==*((typeof(k)*)&m[i]))
-#define map_getr(m,k)   map_getg(m,k==*(((typeof(k)*)&m[i+1])-1))
-#define map_getk(m,k,a) map_getg(m,k==m[i].a)
-
 /* Linked lists */
 typedef struct list {
 	struct list *prev;
@@ -30,7 +47,7 @@ void list_insert_after(list_t *after, void *data);
 
 list_t *list_append(list_t *before, void *data);
 
-list_t *list_remove(list_t *head, list_t *item);
+list_t *list_remove(list_t *head, list_t *item, int freedata);
 
 int list_length(list_t *item);
 
@@ -38,5 +55,11 @@ list_t *list_last(list_t *list);
 
 list_t *list_find(list_t *list, void *data);
 
+list_t *list_sort(list_t *list, int rev, int (*func)(void*,void*));
+
 /* Misc */
+int str2num(char *str, int def);
+
+int warn(char *fmt, ...);
+
 int error(char *fmt, ...);