CVS commit: src/usr.sbin/isdn/isdnd

[Joerg Sonnenberger]

Module Name:    src
Committed By:   joerg
Date:           Fri Mar  2 02:58:46 UTC 2012

Modified Files:
        src/usr.sbin/isdn/isdnd: exec.c

Log Message:
More time_t fallout.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/isdn/isdnd/exec.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.sbin/isdn/isdnd/exec.c
diff -u src/usr.sbin/isdn/isdnd/exec.c:1.10 src/usr.sbin/isdn/isdnd/exec.c:1.11
--- src/usr.sbin/isdn/isdnd/exec.c:1.10	Thu Apr 16 05:56:32 2009
+++ src/usr.sbin/isdn/isdnd/exec.c	Fri Mar  2 02:58:46 2012
@@ -27,7 +27,7 @@
  *	exec.h - supplemental program/script execution
  *	----------------------------------------------
  *
- *	$Id: exec.c,v 1.10 2009/04/16 05:56:32 lukem Exp $ 
+ *	$Id: exec.c,v 1.11 2012/03/02 02:58:46 joerg Exp $ 
  *
  * $FreeBSD$
  *
@@ -316,7 +316,7 @@ upd_callstat_file(char *filename, int ro
 			return;
 		}
 
-		ret = fprintf(fp, "%ld %ld 1", (long)now, (long)now);
+		ret = fprintf(fp, "%jd %jd 1", (intmax_t)now, (intmax_t)now);
 		if (ret <= 0)
 			logit(LL_ERR, "ERROR, upd_callstat_file: fprintf failed: %s", strerror(errno));
 		
@@ -372,7 +372,7 @@ upd_callstat_file(char *filename, int ro
 				return;
 			}
 
-			ret = fprintf(nfp, "%ld %ld %d", (long)s, (long)l, n);
+			ret = fprintf(nfp, "%jd %jd %d", (intmax_t)s, (intmax_t)l, n);
 			if (ret <= 0)
 				logit(LL_ERR, "ERROR, upd_callstat_file: fprintf failed: %s", strerror(errno));
 			
@@ -382,7 +382,7 @@ upd_callstat_file(char *filename, int ro
 			n = 0;
 			s = now;
 
-			logit(LL_WRN, "upd_callstat_file: rotate %s, new s=%ld l=%ld n=%d", filename, s, l, n);
+			logit(LL_WRN, "upd_callstat_file: rotate %s, new s=%jd l=%jd n=%d", filename, (intmax_t)s, (intmax_t)l, n);
 		}				
 	}
 
@@ -393,7 +393,7 @@ upd_callstat_file(char *filename, int ro
 	 * leftovers from previous contents!
 	 */
 
-	ret = fprintf(fp, "%ld %ld %-3d", (long)s, (long)now, n);	
+	ret = fprintf(fp, "%jd %jd %-3d", (time_t)s, (time_t)now, n);	
 
 	if (ret <= 0)
 		logit(LL_ERR, "ERROR, upd_callstat_file: fprintf failed: %s", strerror(errno));