CVS update: php3/functions
| From: | shane | Date: | Sat, 03 Oct 1998 19:10:15 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1603@lists.php.net to get a copy of this message | ||
Date: Saturday October 3, 1998 @ 15:10
Author: shane
Update of /repository/php3/functions
In directory asf:/u2/tmp/cvs-serv27656/functions
Modified Files:
hg_comm.c hw.c string.c
Log Message:
updated project files for vc++6 (still work with vc++5)
removed previous strtok 'fix'
a few compile things elsewhere
Index: php3/functions/hg_comm.c
diff -c php3/functions/hg_comm.c:1.7 php3/functions/hg_comm.c:1.8
*** php3/functions/hg_comm.c:1.7 Tue Sep 22 11:57:28 1998
--- php3/functions/hg_comm.c Sat Oct 3 15:10:13 1998
***************
*** 23,29 ****
+----------------------------------------------------------------------+
*/
! /* $Id: hg_comm.c,v 1.7 1998/09/22 15:57:28 steinm Exp $ */
/* #define HW_DEBUG */
--- 23,29 ----
+----------------------------------------------------------------------+
*/
! /* $Id: hg_comm.c,v 1.8 1998/10/03 19:10:13 shane Exp $ */
/* #define HW_DEBUG */
***************
*** 3213,3218 ****
--- 3213,3219 ----
u = count-1;
pid = id;
pcount = 1;
+ /* FIXME but parentIDs is not set at this point, why checking it? */
while((u >= 0) && (pcount != 0) && (parentIDs != NULL) && (pid != 0))
{
/*fprintf(stderr, "Get parents for %d\n", pid); */
if(0 != send_getparents(sockfd, pid, &parentIDs, &pcount)) {
***************
*** 3940,3946 ****
int *ptr;
if(-1 == (fd = fnCOpenDataCon(sockfd, &port))) {
! efree(msg.buf);
return(-1);
}
--- 3941,3947 ----
int *ptr;
if(-1 == (fd = fnCOpenDataCon(sockfd, &port))) {
! /* not set yet efree(msg.buf); */
return(-1);
}
***************
*** 4117,4123 ****
int *ptr;
if(-1 == (fd = fnCOpenDataCon(sockfd, &port))) {
! efree(msg.buf);
return(-1);
}
--- 4118,4124 ----
int *ptr;
if(-1 == (fd = fnCOpenDataCon(sockfd, &port))) {
! /* not set yet? efree(msg.buf); */
return(-1);
}
Index: php3/functions/hw.c
diff -c php3/functions/hw.c:1.11 php3/functions/hw.c:1.12
*** php3/functions/hw.c:1.11 Sun Sep 20 18:43:47 1998
--- php3/functions/hw.c Sat Oct 3 15:10:14 1998
***************
*** 23,29 ****
+----------------------------------------------------------------------+
*/
! /* $Id: hw.c,v 1.11 1998/09/20 22:43:47 zeev Exp $ */
#if COMPILE_DL
#include "dl/phpdl.h"
#endif
--- 23,29 ----
+----------------------------------------------------------------------+
*/
! /* $Id: hw.c,v 1.12 1998/10/03 19:10:14 shane Exp $ */
#if COMPILE_DL
#include "dl/phpdl.h"
#endif
***************
*** 1454,1459 ****
--- 1454,1461 ----
convert_to_long(arg2);
link=arg1->value.lval;
ptr = php3_list_find(link,&type);
+
+ /* FIXME id is not set anywhere */
if(!ptr || (type!=php3_hw_module.le_socketp && type!=php3_hw_module.le_psocketp)) {
php3_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
***************
*** 1461,1466 ****
--- 1463,1470 ----
doc=arg2->value.lval;
docptr = php3_list_find(doc,&type);
+
+ /* FIXME id is not set anywhere */
if(!docptr || (type!=php3_hw_module.le_document)) {
php3_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
Index: php3/functions/string.c
diff -c php3/functions/string.c:1.141 php3/functions/string.c:1.142
*** php3/functions/string.c:1.141 Tue Sep 29 23:52:21 1998
--- php3/functions/string.c Sat Oct 3 15:10:14 1998
***************
*** 30,36 ****
*/
! /* $Id: string.c,v 1.141 1998/09/30 03:52:21 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 30,36 ----
*/
! /* $Id: string.c,v 1.142 1998/10/03 19:10:14 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 342,354 ****
*STATIC(strtok_pos2) = '\0';
}
RETVAL_STRING(STATIC(strtok_pos1),1);
!
/* skip 'token' white space for next call to strtok */
while (STATIC(strtok_pos2) &&
strchr(tokp, *(STATIC(strtok_pos2)+1))) {
STATIC(strtok_pos2)++;
}
!
if (STATIC(strtok_pos2))
STATIC(strtok_pos1) = STATIC(strtok_pos2) + 1;
else
--- 342,354 ----
*STATIC(strtok_pos2) = '\0';
}
RETVAL_STRING(STATIC(strtok_pos1),1);
! #if 0
/* skip 'token' white space for next call to strtok */
while (STATIC(strtok_pos2) &&
strchr(tokp, *(STATIC(strtok_pos2)+1))) {
STATIC(strtok_pos2)++;
}
! #endif
if (STATIC(strtok_pos2))
STATIC(strtok_pos1) = STATIC(strtok_pos2) + 1;
else
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net