cvs: /php3/functions hg_comm.c hw.c hw.h

steinm Fri Aug 6 02:37:32 1999 EDT Modified files: /php3/functions hg_comm.c hw.c hw.h Log: Changed order of freeing memory. (This was actualle just a problem in php4) Index: php3/functions/hg_comm.c diff -u php3/functions/hg_comm.c:1.27 php3/functions/hg_comm.c:1.28 --- php3/functions/hg_comm.c:1.27 Fri Jul 16 11:29:43 1999 +++ php3/functions/hg_comm.c Fri Aug 6 02:37:31 1999 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hg_comm.c,v 1.27 1999/07/16 15:29:43 steinm Exp $ */ +/* $Id: hg_comm.c,v 1.28 1999/08/06 06:37:31 steinm Exp $ */ /* #define HW_DEBUG */ @@ -1821,13 +1821,13 @@ ptr = (int *) retmsg->buf; if(*ptr == 0) { attributes = estrdup(retmsg->buf+sizeof(int)); - efree(retmsg); efree(retmsg->buf); + efree(retmsg); } else { error = *ptr; attributes = NULL; - efree(retmsg); efree(retmsg->buf); + efree(retmsg); return error; } @@ -1866,20 +1866,20 @@ memcpy(*text, retmsg->buf+sizeof(int), *count); /* *text[*count] = 0; */ } else { - efree(retmsg); efree(retmsg->buf); + efree(retmsg); lowerror = LE_MALLOC; return(-1); } } else { error = *ptr; - efree(retmsg); efree(retmsg->buf); + efree(retmsg); *text = NULL; return(error); } - efree(retmsg); efree(retmsg->buf); + efree(retmsg); if((documenttype != NULL) && (strcmp(documenttype, "Image") != 0)) { if(send_getanchorsobj(sockfd, objectID, &anchors, &ancount) == 0) { @@ -1997,13 +1997,13 @@ ptr = (int *) retmsg->buf; if(*ptr == 0) { attributes = estrdup(retmsg->buf+sizeof(int)); - efree(retmsg); efree(retmsg->buf); + efree(retmsg); } else { error = *ptr; attributes = NULL; - efree(retmsg); efree(retmsg->buf); + efree(retmsg); return error; } @@ -2051,20 +2051,20 @@ if(NULL != (*text = malloc(*count + 1))) { memcpy(*text, ptr, *count); } else { - efree(retmsg); efree(retmsg->buf); + efree(retmsg); lowerror = LE_MALLOC; return(-1); } } else { error = *ptr + 1024; /* move errors to >2024 */ - efree(retmsg); efree(retmsg->buf); + efree(retmsg); *text = NULL; return(error); } - efree(retmsg); efree(retmsg->buf); + efree(retmsg); return(0); } @@ -2101,13 +2101,13 @@ ptr = (int *) retmsg->buf; if(*ptr == 0) { attributes = estrdup(retmsg->buf+sizeof(int)); - efree(retmsg); efree(retmsg->buf); + efree(retmsg); } else { error = *ptr; attributes = NULL; - efree(retmsg); efree(retmsg->buf); + efree(retmsg); return error; } @@ -2144,20 +2144,20 @@ memcpy(*text, ptr+2, *count); /* *text[*count] = 0; */ } else { - efree(retmsg); efree(retmsg->buf); + efree(retmsg); lowerror = LE_MALLOC; return(-1); } } else { error = *ptr + 1024; /* move errors to >2024 */ - efree(retmsg); efree(retmsg->buf); + efree(retmsg); *text = NULL; return(error); } - efree(retmsg); efree(retmsg->buf); + efree(retmsg); return(0); } @@ -2194,13 +2194,13 @@ ptr = (int *) retmsg->buf; if(*ptr == 0) { attributes = estrdup(retmsg->buf+sizeof(int)); - efree(retmsg); efree(retmsg->buf); + efree(retmsg); } else { error = *ptr; attributes = NULL; - efree(retmsg); efree(retmsg->buf); + efree(retmsg); return error; } */ @@ -2242,8 +2242,8 @@ sum += *ptr; } } else { - efree(retmsg); efree(retmsg->buf); + efree(retmsg); lowerror = LE_MALLOC; return(-1); } @@ -2256,8 +2256,8 @@ memcpy(*text, ptr, remlen); } else { efree(childIDs); - efree(retmsg); efree(retmsg->buf); + efree(retmsg); lowerror = LE_MALLOC; return(-1); } @@ -2319,9 +2319,9 @@ return(-1); } - efree(retmsg); error = *((int *) retmsg->buf); efree(retmsg->buf); + efree(retmsg); return(error); } @@ -4164,15 +4164,15 @@ ptr = (int *) retmsg->buf; if((ptr == NULL) || (*ptr != 0)) { error = *ptr; - efree(retmsg); if(retmsg->buf) efree(retmsg->buf); + efree(retmsg); if(attributes) efree(attributes); HWSOCK_FCLOSE(fd); return(error); } - efree(retmsg); efree(retmsg->buf); + efree(retmsg); /* passively open the data connection. The HG server is probably already waiting for us. @@ -4346,15 +4346,15 @@ ptr = (int *) retmsg->buf; if((ptr == NULL) || (*ptr != 0)) { - efree(retmsg); if(retmsg->buf) efree(retmsg->buf); + efree(retmsg); if(attributes) efree(attributes); HWSOCK_FCLOSE(fd); return(-1); } - efree(retmsg); efree(retmsg->buf); + efree(retmsg); /* passively open the data connection. The HG server is probably already waiting for us. @@ -4444,8 +4444,8 @@ ptr++; *objectID = *ptr; } else { - efree(retmsg); if(retmsg->buf) efree(retmsg->buf); + efree(retmsg); return(error); } @@ -4551,14 +4551,14 @@ ptr = (int *) retmsg->buf; if((ptr == NULL) || (*ptr != 0)) { - efree(retmsg); if(retmsg->buf) efree(retmsg->buf); + efree(retmsg); HWSOCK_FCLOSE(fd); return(-1); } - efree(retmsg); efree(retmsg->buf); + efree(retmsg); return(0); } @@ -4783,8 +4783,8 @@ return(-1); } - efree(retmsg); *answer = retmsg->buf; + efree(retmsg); return(0); } Index: php3/functions/hw.c diff -u php3/functions/hw.c:1.44 php3/functions/hw.c:1.45 --- php3/functions/hw.c:1.44 Wed Jul 7 11:31:16 1999 +++ php3/functions/hw.c Fri Aug 6 02:37:31 1999 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.44 1999/07/07 15:31:16 steinm Exp $ */ +/* $Id: hw.c,v 1.45 1999/08/06 06:37:31 steinm Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -33,13 +33,24 @@ #undef THREAD_SAFE #endif +#if !(WIN32|WINNT) #include "php.h" #include "internal_functions.h" +#include "php3_list.h" +#endif +#include "php.h" +#include "head.h" + +/* +#include "php.h" +#include "internal_functions.h" #include "head.h" #include "php3_list.h" -#include "hw.h" +*/ #if HYPERWAVE +#include "hw.h" + #if APACHE # ifndef DEBUG Index: php3/functions/hw.h diff -u php3/functions/hw.h:1.8 php3/functions/hw.h:1.9 --- php3/functions/hw.h:1.8 Thu Jun 10 05:25:02 1999 +++ php3/functions/hw.h Fri Aug 6 02:37:31 1999 @@ -23,7 +23,7 @@ */ -/* $Id: hw.h,v 1.8 1999/06/10 09:25:02 steinm Exp $ */ +/* $Id: hw.h,v 1.9 1999/08/06 06:37:31 steinm Exp $ */ #ifndef _HW_H #define _HW_H @@ -66,7 +66,6 @@ PHP_FUNCTION(hw_cp); PHP_FUNCTION(hw_deleteobject); PHP_FUNCTION(hw_changeobject); -PHP_FUNCTION(hw_groupchangeobject); PHP_FUNCTION(hw_modifyobject); PHP_FUNCTION(hw_getparents); PHP_FUNCTION(hw_getparentsobj);