X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=util.h;h=bc23ecd9a6005fce68d6007bec1b6cb016845039;hb=c4649a6a217d6fdfba8f58d14b82e55bff99bf84;hp=2468ebec9a1096ddf648eef5644f875519d4e91d;hpb=eefa2034ad0f5c2ef5eb478984cfc53a6a40c6b7;p=wmpus

diff --git a/util.h b/util.h
index 2468ebe..bc23ecd 100644
--- a/util.h
+++ b/util.h
@@ -1,18 +1,16 @@
 /*
- * Copyright (C) 2011 Andy Spencer <andy753421@gmail.com>
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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 */
@@ -26,16 +24,16 @@
 #define countof(x) (sizeof(x)/sizeof((x)[0]))
 
 /* Constant length map functions */
-#define map_getg(map, test) ({ \
-	int i; \
-	for (i = 0; i < countof(map) && !(test); i++); \
-	i < countof(map) ? &map[i] : NULL ; \
+#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;
@@ -49,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);
 
@@ -57,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, ...);