Module Name: xsrc
Committed By: wiz
Date: Fri Jun 28 17:25:47 UTC 2013
Modified Files:
xsrc/external/mit/xdm/dist/xdm: dm.c xdmauth.c
Log Message:
Improvements to format strings from upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xdm/dist/xdm/dm.c \
xsrc/external/mit/xdm/dist/xdm/xdmauth.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xdm/dist/xdm/dm.c
diff -u xsrc/external/mit/xdm/dist/xdm/dm.c:1.1.1.1 xsrc/external/mit/xdm/dist/xdm/dm.c:1.2
--- xsrc/external/mit/xdm/dist/xdm/dm.c:1.1.1.1 Fri May 31 22:19:37 2013
+++ xsrc/external/mit/xdm/dist/xdm/dm.c Fri Jun 28 17:25:47 2013
@@ -536,7 +536,7 @@ WaitForChild (void)
time(&now);
crash = d->lastReserv &&
((now - d->lastReserv) < XDM_BROKEN_INTERVAL);
- Debug("time %i %i try %i of %i%s\n", now, d->lastReserv,
+ Debug("time %li %li try %i of %i%s\n", now, d->lastReserv,
d->reservTries, d->reservAttempts,
crash ? " crash" : "");
Index: xsrc/external/mit/xdm/dist/xdm/xdmauth.c
diff -u xsrc/external/mit/xdm/dist/xdm/xdmauth.c:1.1.1.1 xsrc/external/mit/xdm/dist/xdm/xdmauth.c:1.2
--- xsrc/external/mit/xdm/dist/xdm/xdmauth.c:1.1.1.1 Fri May 31 22:19:37 2013
+++ xsrc/external/mit/xdm/dist/xdm/xdmauth.c Fri Jun 28 17:25:47 2013
@@ -234,7 +234,7 @@ XdmGetKey(struct protoDisplay *pdpy, ARR
if (line[0] == '#' || sscanf (line, "%s %s", id, key) != 2)
continue;
bzero(line, sizeof(line));
- Debug ("Key entry for \"%s\" %d bytes\n", id, strlen(key));
+ Debug ("Key entry for \"%s\" %ld bytes\n", id, strlen(key));
if (strlen (id) == displayID->length &&
!strncmp (id, (char *)displayID->data, displayID->length))
{
