svn commit: samba r7045 - in trunk/source/lib: .
jra at samba.org
jra at samba.org
Fri May 27 23:53:11 GMT 2005
Author: jra
Date: 2005-05-27 23:53:09 +0000 (Fri, 27 May 2005)
New Revision: 7045
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7045
Log:
My oops :-). timediff needs SMB_BIG_INT, not SMB_BIG_UINT !
Jeremy.
Modified:
trunk/source/lib/util_sock.c
Changeset:
Modified: trunk/source/lib/util_sock.c
===================================================================
--- trunk/source/lib/util_sock.c 2005-05-27 23:52:41 UTC (rev 7044)
+++ trunk/source/lib/util_sock.c 2005-05-27 23:53:09 UTC (rev 7045)
@@ -248,7 +248,7 @@
static BOOL timeout_until(struct timeval *timeout, const struct timeval *endtime)
{
struct timeval now;
- SMB_BIG_UINT t_dif;
+ SMB_BIG_INT t_dif;
GetTimeOfDay(&now);
@@ -257,8 +257,8 @@
return False;
}
- timeout->tv_sec = (t_dif / 1000000);
- timeout->tv_usec = (t_dif % 1000000);
+ timeout->tv_sec = (t_dif / (SMB_BIG_INT)1000000);
+ timeout->tv_usec = (t_dif % (SMB_BIG_INT)1000000);
return True;
}
@@ -462,7 +462,7 @@
ret = sys_write(fd,buffer + total,N - total);
if (ret == -1) {
- DEBUG(0,("write_data: write failure. Error = %s\n", strerror(errno) ));
+ DEBUG(0,("write_data_until: write failure. Error = %s\n", strerror(errno) ));
return -1;
}
if (ret == 0)
More information about the samba-cvs
mailing list