tinc/src logger.c,1.1.2.11,1.1.2.12 process.c,1.1.2.75,1.1.2.76 tincd.c,1.10.4.88,1.10.4.89

[Guus Sliepen <guus@nl.linux.org>]

Update of /home/CVS/tinc/src
In directory humbolt:/tmp/cvs-serv18254/src

Modified Files:
      Tag: CABAL
	logger.c process.c tincd.c 
Log Message:
PIDs are of type pid_t, and use %ld when reading/writing them to the pidfile.


Index: logger.c
===================================================================
RCS file: /home/CVS/tinc/src/logger.c,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- logger.c	2003/08/17 12:04:35	1.1.2.11
+++ logger.c	2003/10/06 16:13:07	1.1.2.12
@@ -78,7 +78,7 @@
 			fflush(stderr);
 			break;
 		case LOGMODE_FILE:
-			fprintf(logfile, "%ld %s[%d]: ", time(NULL), logident, logpid);
+			fprintf(logfile, "%ld %s[%ld]: ", time(NULL), logident, (long)logpid);
 			vfprintf(logfile, format, ap);
 			fprintf(logfile, "\n");
 			fflush(logfile);

Index: process.c
===================================================================
RCS file: /home/CVS/tinc/src/process.c,v
retrieving revision 1.1.2.75
retrieving revision 1.1.2.76
diff -u -r1.1.2.75 -r1.1.2.76
--- process.c	2003/08/22 15:07:57	1.1.2.75
+++ process.c	2003/10/06 16:13:08	1.1.2.76
@@ -58,19 +58,6 @@
 
 /* Some functions the less gifted operating systems might lack... */
 
-#ifndef HAVE_FCLOSEALL
-static int fcloseall(void)
-{
-	fflush(stdin);
-	fflush(stdout);
-	fflush(stderr);
-	fclose(stdin);
-	fclose(stdout);
-	fclose(stderr);
-	return 0;
-}
-#endif
-
 #ifdef HAVE_MINGW
 extern char *identname;
 extern char *program_name;
@@ -254,7 +241,7 @@
 */
 static bool write_pidfile(void)
 {
-	int pid;
+	pid_t pid;
 
 	cp();
 
@@ -262,10 +249,10 @@
 
 	if(pid) {
 		if(netname)
-			fprintf(stderr, _("A tincd is already running for net `%s' with pid %d.\n"),
-					netname, pid);
+			fprintf(stderr, _("A tincd is already running for net `%s' with pid %ld.\n"),
+					netname, (long)pid);
 		else
-			fprintf(stderr, _("A tincd is already running with pid %d.\n"), pid);
+			fprintf(stderr, _("A tincd is already running with pid %ld.\n"), (long)pid);
 		return false;
 	}
 
@@ -283,7 +270,7 @@
 bool kill_other(int signal)
 {
 #ifndef HAVE_MINGW
-	int pid;
+	pid_t pid;
 
 	cp();
 

Index: tincd.c
===================================================================
RCS file: /home/CVS/tinc/src/tincd.c,v
retrieving revision 1.10.4.88
retrieving revision 1.10.4.89
diff -u -r1.10.4.88 -r1.10.4.89
--- tincd.c	2003/09/25 10:34:16	1.10.4.88
+++ tincd.c	2003/10/06 16:13:08	1.10.4.89
@@ -39,6 +39,7 @@
 #include <lzo1x.h>
 
 #include <getopt.h>
+#include <pidfile.h>
 
 #include "conf.h"
 #include "device.h"

--
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/