X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/460b9539a7c15580e41a71bbc0f47ae776238915..4265e5d362914f3732b4035dcf67162e525e0142:/lib/table.h?ds=sidebyside

diff --git a/lib/table.h b/lib/table.h
index 476399d..db237ac 100644
--- a/lib/table.h
+++ b/lib/table.h
@@ -1,33 +1,35 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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 2 of the License, or
+ * 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.
- *
+ * 
+ * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/** @file lib/table.h
+ * @brief Generic binary search
  */
-
 #ifndef TABLE_H
 #define TABLE_H
 
-#define TABLE_FIND(TABLE, TYPE, FIELD, NAME)	\
-  table_find((void *)TABLE,		       	\
-	     offsetof(TYPE, FIELD),		\
-	     sizeof (TYPE),			\
-	     sizeof TABLE / sizeof (TYPE),	\
+#include <stddef.h>
+
+#define TABLE_FIND(TABLE, FIELD, NAME)			\
+  table_find((void *)TABLE,				\
+	     offsetof(typeof((TABLE)[0]), FIELD),	\
+	     sizeof ((TABLE)[0]),			\
+	     sizeof TABLE / sizeof ((TABLE)[0]),	\
 	     NAME)
-/* Search TYPE TABLE[] for an element where TABLE[N].FIELD matches NAME
+/* Search TABLE[] for an element where TABLE[N].FIELD matches NAME
  * Returns the index N on success or -1 if not found
  * The table must be lexically sorted on FIELD
  */
@@ -43,4 +45,3 @@ c-basic-offset:2
 comment-column:40
 End:
 */
-/* arch-tag:15b07f98a592f80e4e22dd3f213f2580 */