Fix mis-merged trackdb_open().

[disorder] / lib / client-common.h

diff --git a/lib/client-common.h b/lib/client-common.h
index 0d883695fa3caa5408dfbb4a4a59e119de382554..736ac6f209a363cc936ec4b9af39c25e8e2b8483 100644 (file)
--- a/lib/client-common.h
+++ b/lib/client-common.h
@@ -1,31 +1,31 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2004, 2005, 2006 Richard Kettlewell
+ * Copyright (C) 2004-2007 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/client-common.h
+ * @brief Common code to client APIs
  */
 
 #ifndef CLIENT_COMMON_H
 #define CLIENT_COMMON_H
 
-int with_sockaddr(void *c,
-                  int (*function)(void *c,
-                                  const struct sockaddr *sa,
-                                  socklen_t len,
-                                  const char *ident));
+#include <sys/types.h>
+#include <sys/socket.h>
+
+socklen_t find_server(struct config *c, struct sockaddr **sap, char **namep);
 
 #endif /* CLIENT_COMMON_H */