[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

tinc/lib avl_tree.c,1.1.2.15,1.1.2.16 dropin.c,1.1.2.14,1.1.2.15 dropin.h,1.1.2.11,1.1.2.12 fake-getaddrinfo.c,1.1.2.3,1.1.2.4 fake-getaddrinfo.h,1.1.2.2,1.1.2.3 fake-getnameinfo.c,1.1.2.6,1.1.2.7 fake-getnameinfo.h,1.1.2.2,1.1.2.3 ipv6.h,1.1.2.3,1.1.2.4 list.c,1.1.2.15,1.1.2.16 pidfile.c,1.1.1.1.4.3,1.1.1.1.4.4 utils.c,1.1.1.1.4.14,1.1.1.1.4.15 utils.h,1.1.1.1.4.15,1.1.1.1.4.16

Update of /home/CVS/tinc/lib
In directory humbolt:/tmp/cvs-serv5751/lib

Modified Files:
      Tag: CABAL
	avl_tree.c dropin.c dropin.h fake-getaddrinfo.c 
	fake-getaddrinfo.h fake-getnameinfo.c fake-getnameinfo.h 
	ipv6.h list.c pidfile.c utils.c utils.h 
Log Message:
Big header file cleanup: everything that has to do with standard system
libraries is moved to system.h.


Index: avl_tree.c
===================================================================
RCS file: /home/CVS/tinc/lib/avl_tree.c,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- avl_tree.c	2003/07/12 17:48:38	1.1.2.15
+++ avl_tree.c	2003/07/17 15:06:25	1.1.2.16
@@ -32,11 +32,10 @@
     $Id$
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <xalloc.h>
+#include "system.h"
 
 #include "avl_tree.h"
+#include "xalloc.h"
 
 #ifdef AVL_COUNT
 #define AVL_NODE_COUNT(n)  ((n) ? (n)->count : 0)

Index: dropin.c
===================================================================
RCS file: /home/CVS/tinc/lib/dropin.c,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- dropin.c	2003/07/12 17:48:38	1.1.2.14
+++ dropin.c	2003/07/17 15:06:25	1.1.2.15
@@ -20,20 +20,7 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include <xalloc.h>
-
-#include <system.h>
-#include <errno.h>
+#include "system.h"
 
 #ifndef HAVE_DAEMON
 /*

Index: dropin.h
===================================================================
RCS file: /home/CVS/tinc/lib/dropin.h,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- dropin.h	2003/07/12 17:48:38	1.1.2.11
+++ dropin.h	2003/07/17 15:06:25	1.1.2.12
@@ -36,8 +36,6 @@
 #endif
 
 #ifndef HAVE_GETNAMEINFO
-#include <sys/types.h>
-#include <sys/socket.h>
 extern int getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
 					   size_t hostlen, char *serv, size_t servlen, int flags);
 #endif

Index: fake-getaddrinfo.c
===================================================================
RCS file: /home/CVS/tinc/lib/Attic/fake-getaddrinfo.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- fake-getaddrinfo.c	2003/07/11 16:12:59	1.1.2.3
+++ fake-getaddrinfo.c	2003/07/17 15:06:25	1.1.2.4
@@ -9,17 +9,7 @@
  * that ai_family is AF_INET. Don't use it for another purpose.
  */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-
-#include <system.h>
+#include "system.h"
 
 #include "fake-getaddrinfo.h"
 

Index: fake-getaddrinfo.h
===================================================================
RCS file: /home/CVS/tinc/lib/Attic/fake-getaddrinfo.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- fake-getaddrinfo.h	2003/07/06 23:16:27	1.1.2.2
+++ fake-getaddrinfo.h	2003/07/17 15:06:25	1.1.2.3
@@ -3,12 +3,6 @@
 #ifndef _FAKE_GETADDRINFO_H
 #define _FAKE_GETADDRINFO_H
 
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
 #include "fake-gai-errnos.h"
 
 #ifndef AI_PASSIVE

Index: fake-getnameinfo.c
===================================================================
RCS file: /home/CVS/tinc/lib/Attic/fake-getnameinfo.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- fake-getnameinfo.c	2003/01/17 00:43:57	1.1.2.6
+++ fake-getnameinfo.c	2003/07/17 15:06:25	1.1.2.7
@@ -9,17 +9,7 @@
  * that ai_family is AF_INET. Don't use it for another purpose.
  */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-
-#include <system.h>
+#include "system.h"
 
 #include "fake-getnameinfo.h"
 #include "fake-getaddrinfo.h"

Index: fake-getnameinfo.h
===================================================================
RCS file: /home/CVS/tinc/lib/Attic/fake-getnameinfo.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- fake-getnameinfo.h	2003/07/12 17:41:45	1.1.2.2
+++ fake-getnameinfo.h	2003/07/17 15:06:25	1.1.2.3
@@ -3,11 +3,6 @@
 #ifndef _FAKE_GETNAMEINFO_H
 #define _FAKE_GETNAMEINFO_H
 
-#include "config.h"
-
-#include <sys/socket.h>
-#include <netdb.h>
-
 #ifndef HAVE_GETNAMEINFO
 int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, 
                 size_t hostlen, char *serv, size_t servlen, int flags);

Index: ipv6.h
===================================================================
RCS file: /home/CVS/tinc/lib/Attic/ipv6.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ipv6.h	2003/07/11 16:12:59	1.1.2.3
+++ ipv6.h	2003/07/17 15:06:25	1.1.2.4
@@ -23,13 +23,6 @@
 #ifndef __TINC_IPV6_H__
 #define __TINC_IPV6_H__
 
-#include "config.h"
-
-#include <netinet/in.h>
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
 #ifndef AF_INET6
 #define AF_INET6 10
 #endif

Index: list.c
===================================================================
RCS file: /home/CVS/tinc/lib/list.c,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- list.c	2003/07/12 17:48:38	1.1.2.15
+++ list.c	2003/07/17 15:06:25	1.1.2.16
@@ -20,14 +20,10 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <stdlib.h>
-
-#include <xalloc.h>
-#include <system.h>
+#include "system.h"
 
 #include "list.h"
+#include "xalloc.h"
 
 /* (De)constructors */
 

Index: pidfile.c
===================================================================
RCS file: /home/CVS/tinc/lib/pidfile.c,v
retrieving revision 1.1.1.1.4.3
retrieving revision 1.1.1.1.4.4
diff -u -r1.1.1.1.4.3 -r1.1.1.1.4.4
--- pidfile.c	2002/09/10 09:40:20	1.1.1.1.4.3
+++ pidfile.c	2003/07/17 15:06:25	1.1.1.1.4.4
@@ -25,16 +25,7 @@
  *	First version (v0.2) released
  */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <string.h>
-#include <errno.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <fcntl.h>
+#include "system.h"
 
 /* read_pid
  *

Index: utils.c
===================================================================
RCS file: /home/CVS/tinc/lib/utils.c,v
retrieving revision 1.1.1.1.4.14
retrieving revision 1.1.1.1.4.15
diff -u -r1.1.1.1.4.14 -r1.1.1.1.4.15
--- utils.c	2003/07/12 17:48:38	1.1.1.1.4.14
+++ utils.c	2003/07/17 15:06:25	1.1.1.1.4.15
@@ -18,15 +18,10 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "config.h"
+#include "system.h"
 
-#include <sys/types.h>
-#include <ctype.h>
-#include <string.h>
-
-#include <utils.h>
-#include <syslog.h>
-#include <xalloc.h>
+#include "../src/logger.h"
+#include "utils.h"
 
 #ifdef ENABLE_TRACING
 volatile int (cp_line[]) = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -64,7 +59,7 @@
 #ifdef ENABLE_TRACING
 void cp_trace()
 {
-	syslog(LOG_DEBUG, "Checkpoint trace: %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d...",
+	logger(LOG_DEBUG, "Checkpoint trace: %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d...",
 		   cp_file[(cp_index + 15) % 16], cp_line[(cp_index + 15) % 16],
 		   cp_file[(cp_index + 14) % 16], cp_line[(cp_index + 14) % 16],
 		   cp_file[(cp_index + 13) % 16], cp_line[(cp_index + 13) % 16],

Index: utils.h
===================================================================
RCS file: /home/CVS/tinc/lib/utils.h,v
retrieving revision 1.1.1.1.4.15
retrieving revision 1.1.1.1.4.16
diff -u -r1.1.1.1.4.15 -r1.1.1.1.4.16
--- utils.h	2003/07/12 17:48:38	1.1.1.1.4.15
+++ utils.h	2003/07/17 15:06:25	1.1.1.1.4.16
@@ -21,14 +21,6 @@
 #ifndef __TINC_UTILS_H__
 #define __TINC_UTILS_H__
 
-#include <ctype.h>
-
-#include "fake-getaddrinfo.h"
-#include "fake-getnameinfo.h"
-#include "ipv6.h"
-
-#define min(a,b) (((a)<(b))?(a):(b))
-
 #ifdef ENABLE_TRACING
 extern volatile int cp_line[];
 extern volatile char *cp_file[];

--
Tinc-cvs:     CVS changelog list for the tinc VPN daemon
Archive:      http://mail.nl.linux.org/tinc-cvs/
Tinc site:    http://tinc.nl.linux.org/