Module Name: src
Committed By: joerg
Date: Tue May 24 16:03:15 UTC 2011
Modified Files:
src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c
Log Message:
Fix formatting of time_t
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/libraries/libldap/os-local.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
diff -u src/external/bsd/openldap/dist/libraries/libldap/os-ip.c:1.4 src/external/bsd/openldap/dist/libraries/libldap/os-ip.c:1.5
--- src/external/bsd/openldap/dist/libraries/libldap/os-ip.c:1.4 Sun Dec 12 15:46:33 2010
+++ src/external/bsd/openldap/dist/libraries/libldap/os-ip.c Tue May 24 16:03:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: os-ip.c,v 1.4 2010/12/12 15:46:33 adam Exp $ */
+/* $NetBSD: os-ip.c,v 1.5 2011/05/24 16:03:15 joerg Exp $ */
/* os-ip.c -- platform-specific TCP & UDP related code */
/* OpenLDAP: pkg/ldap/libraries/libldap/os-ip.c,v 1.118.2.20 2010/04/13 20:22:58 kurt Exp */
@@ -283,8 +283,8 @@
int rc;
- osip_debug(ld, "ldap_int_poll: fd: %d tm: %ld\n",
- s, tvp ? tvp->tv_sec : -1L, 0);
+ osip_debug(ld, "ldap_int_poll: fd: %d tm: %jd\n",
+ s, tvp ? (intmax_t)tvp->tv_sec : -1, 0);
#ifdef HAVE_POLL
{
@@ -432,8 +432,8 @@
opt_tv = &tv;
}
- osip_debug(ld, "ldap_pvt_connect: fd: %d tm: %ld async: %d\n",
- s, opt_tv ? tv.tv_sec : -1L, async);
+ osip_debug(ld, "ldap_pvt_connect: fd: %d tm: %jd async: %d\n",
+ s, opt_tv ? (intmax_t)tv.tv_sec : -1, async);
if ( opt_tv && ldap_pvt_ndelay_on(ld, s) == -1 )
return ( -1 );
Index: src/external/bsd/openldap/dist/libraries/libldap/os-local.c
diff -u src/external/bsd/openldap/dist/libraries/libldap/os-local.c:1.5 src/external/bsd/openldap/dist/libraries/libldap/os-local.c:1.6
--- src/external/bsd/openldap/dist/libraries/libldap/os-local.c:1.5 Sun Dec 12 15:46:33 2010
+++ src/external/bsd/openldap/dist/libraries/libldap/os-local.c Tue May 24 16:03:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: os-local.c,v 1.5 2010/12/12 15:46:33 adam Exp $ */
+/* $NetBSD: os-local.c,v 1.6 2011/05/24 16:03:15 joerg Exp $ */
/* os-local.c -- platform-specific domain socket code */
/* OpenLDAP: pkg/ldap/libraries/libldap/os-local.c,v 1.44.2.10 2010/04/13 20:22:59 kurt Exp */
@@ -178,8 +178,8 @@
opt_tv = &tv;
}
- oslocal_debug(ld, "ldap_connect_timeout: fd: %d tm: %ld async: %d\n",
- s, opt_tv ? tv.tv_sec : -1L, async);
+ oslocal_debug(ld, "ldap_connect_timeout: fd: %d tm: %jd async: %d\n",
+ s, opt_tv ? (intmax_t)tv.tv_sec : -1, async);
if ( ldap_pvt_ndelay_on(ld, s) == -1 ) return -1;
