X-Git-Url: http://pileus.org/git/?p=wmpus;a=blobdiff_plain;f=util.h;h=65b82f5ec6bfa68f703c7853d74c5df4ba7ed787;hp=a572a0aabd01d9528b751777ccb241e1c0584536;hb=6676472c287a8163d53b2ba14ca8ec39bf7443eb;hpb=c00388973ecb2af94cc7b74ef762f0b8d10741e6

diff --git a/util.h b/util.h
index a572a0a..65b82f5 100644
--- a/util.h
+++ b/util.h
@@ -1,3 +1,21 @@
+/*
+ * 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))
 
@@ -5,9 +23,41 @@
 
 #define countof(x) (sizeof(x)/sizeof((x)[0]))
 
-#define map_get(map, key) ({ \
+/* Constant length map functions */
+#define map_getg(map, test) ({ \
 	int i; \
-	for (i = 0; i < countof(map) && \
-		*((typeof(key)*)&map[i]) != key; i++); \
+	for (i = 0; i < countof(map) && !(test); i++); \
 	i < countof(map) ? &map[i] : NULL ; \
 })
+
+#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;
+	struct list *next;
+	void   *data;
+} list_t;
+
+list_t *list_insert(list_t *after, void *data);
+
+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, int freedata);
+
+int list_length(list_t *item);
+
+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 error(char *fmt, ...);