[wpdev-commits] wolfpack/python socket.cpp,1.89,1.90

[Sebastian H. <dar...@us...>]

Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23545/python

Modified Files:
	socket.cpp 
Log Message:
Fixes

Index: socket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/socket.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** socket.cpp	2 Oct 2004 09:59:51 -0000	1.89
--- socket.cpp	18 Oct 2004 12:09:53 -0000	1.90
***************
*** 332,338 ****
  	char* timeoutfunc = 0;
  	unsigned int timeout = 0;
  
! 	if ( !PyArg_ParseTuple( args, "sHO!|ssI:socket.attachmultitarget"
! 		"(callback, multi, args, [cancelcallback], [timeoutcallback], [timeout])", &responsefunc, &multiid, &PyList_Type, &targetargs, &cancelfunc, &timeoutfunc, &timeout ) )
  	{
  		return 0;
--- 332,339 ----
  	char* timeoutfunc = 0;
  	unsigned int timeout = 0;
+ 	short xoffset, yoffset, zoffset;
  
! 	if ( !PyArg_ParseTuple( args, "sHO!hhh|ssI:socket.attachmultitarget"
! 		"(callback, multi, args, xoffset, yoffset, zoffset, [cancelcallback], [timeoutcallback], [timeout])", &responsefunc, &multiid, &PyList_Type, &targetargs, &xoffset, &yoffset, &zoffset, &cancelfunc, &timeoutfunc, &timeout ) )
  	{
  		return 0;
***************
*** 343,352 ****
  	cPythonTarget* target = new cPythonTarget( responsefunc, timeoutfunc, cancelfunc, targetargs );
  
! 	if ( timeout )
! 	{
  		target->setTimeout( Server::instance()->time() + timeout );
  	}
  
! 	self->pSock->attachTarget( target, 0x4000 + multiid );
  	Py_RETURN_NONE;
  }
--- 344,352 ----
  	cPythonTarget* target = new cPythonTarget( responsefunc, timeoutfunc, cancelfunc, targetargs );
  
! 	if ( timeout ) {
  		target->setTimeout( Server::instance()->time() + timeout );
  	}
  
! 	self->pSock->attachTarget( target, 0x4000 + multiid, xoffset, yoffset, zoffset );
  	Py_RETURN_NONE;
  }