Fix mis-merged trackdb_open().

[disorder] / lib / signame.c

diff --git a/lib/signame.c b/lib/signame.c
index 3e30f80c7c3b79a81f897b14f25332d8f777a906..27f9509c49653419b7f19fdf8a0e3460035fe23b 100644 (file)
--- a/lib/signame.c
+++ b/lib/signame.c
@@ -1,25 +1,24 @@
 /*
  * 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/>.
  */
-
-#include <config.h>
-#include "types.h"
+/** @file lib/signame.c
+ * @brief Signal names
+ */
+#include "common.h"
 
 #include <signal.h>
 #include <stddef.h>
@@ -135,10 +134,14 @@ static const struct sigtable {
 #undef S
 };
 
+/** @brief Map a signal name to its number
+ * @param s Signal name e.g. "SIGINT"
+ * @return Signal value or -1 if not found
+ */
 int find_signal(const char *s) {
   int n;
 
-  if((n = TABLE_FIND(signals, struct sigtable, name, s)) < 0)
+  if((n = TABLE_FIND(signals, name, s)) < 0)
     return -1;
   return signals[n].signal;
 }