[or-cvs] unbork windows line endings

Nick Mathewson nickm at seul.org
Tue Aug 12 03:16:17 UTC 2003


Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv28135/src/or

Modified Files:
	directory.c or.h test.c 
Log Message:
unbork windows line endings

Index: directory.c
===================================================================
RCS file: /home/or/cvsroot/src/or/directory.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- directory.c	12 Aug 2003 03:08:41 -0000	1.19
+++ directory.c	12 Aug 2003 03:16:15 -0000	1.20
@@ -56,7 +56,7 @@
     connection_free(conn);
     return;
   }
-  set_socket_nonblocking(s);
+  set_socket_nonblocking(s);
 
   memset((void *)&router_addr,0,sizeof(router_addr));
   router_addr.sin_family = AF_INET;

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- or.h	12 Aug 2003 03:08:41 -0000	1.102
+++ or.h	12 Aug 2003 03:16:15 -0000	1.103
@@ -9,21 +9,21 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <limits.h>
+#include <limits.h>
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+#include <unistd.h>
+#endif
 #ifdef HAVE_STRING_H
-#include <string.h>
-#endif
+#include <string.h>
+#endif
 #ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#endif
+#include <signal.h>
+#endif
 #ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
+#include <netdb.h>
+#endif
 #ifdef HAVE_CTYPE_H
-#include <ctype.h>
+#include <ctype.h>
 #endif
 #include "../common/torint.h"
 #ifdef HAVE_SYS_POLL_H
@@ -32,59 +32,59 @@
 #include <poll.h>
 #else
 #include "../common/fakepoll.h"
-#endif
+#endif
 #ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
+#include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
+#include <sys/fcntl.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
 #ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
+#include <sys/ioctl.h>
+#endif
 #ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
+#include <sys/socket.h>
+#endif
 #ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
+#include <sys/time.h>
+#endif
 #ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
+#include <sys/stat.h>
+#endif
 #ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
+#include <netinet/in.h>
+#endif
 #ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
+#include <arpa/inet.h>
+#endif
 #ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
+#include <errno.h>
+#endif
 #ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
+#include <assert.h>
+#endif
 #ifdef HAVE_TIME_H
-#include <time.h>
-#endif
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
-#if _MSC_VER > 1300
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#elif defined(_MSC_VER)
-#include <winsock.h>
-#endif
-
-#ifdef _MSC_VER
-#include <io.h>
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#define snprintf
-#endif
+#include <time.h>
+#endif
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#if _MSC_VER > 1300
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#elif defined(_MSC_VER)
+#include <winsock.h>
+#endif
+
+#ifdef _MSC_VER
+#include <io.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#define snprintf
+#endif
 
 
 #include "../common/crypto.h"

Index: test.c
===================================================================
RCS file: /home/or/cvsroot/src/or/test.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- test.c	12 Aug 2003 03:08:41 -0000	1.31
+++ test.c	12 Aug 2003 03:16:15 -0000	1.32
@@ -2,15 +2,15 @@
 /* See LICENSE for licensing information */
 /* $Id$ */
 
-#include <stdio.h>
+#include <stdio.h>
 #ifdef HAVE_FCNTL_H
-#include <fcntl.h>
+#include <fcntl.h>
+#endif
+
+#ifdef _MSC_VER
+/* For mkdir() */
+#include <direct.h>
 #endif
-
-#ifdef _MSC_VER
-/* For mkdir() */
-#include <direct.h>
-#endif
 
 #include "or.h"
 #include "../common/test.h"
@@ -32,13 +32,13 @@
 
 void
 setup_directory() {
-  char buf[256];
+  char buf[256];
   int r;
-  sprintf(buf, "/tmp/tor_test");
-#ifdef _MSC_VER
-  r = mkdir(buf);
-#else
-  r = mkdir(buf, 0700);
+  sprintf(buf, "/tmp/tor_test");
+#ifdef _MSC_VER
+  r = mkdir(buf);
+#else
+  r = mkdir(buf, 0700);
 #endif
   if (r && errno != EEXIST)
     fprintf(stderr, "Can't create directory %s", buf);



More information about the tor-commits mailing list