iliaa Sun Jun 15 23:05:24 2003 EDT
Modified files:
/php4/ext/hyperwave hw.c hg_comm.c
Log:
Fixed a few remaining compiler warnings.
Index: php4/ext/hyperwave/hw.c
diff -u php4/ext/hyperwave/hw.c:1.123 php4/ext/hyperwave/hw.c:1.124
--- php4/ext/hyperwave/hw.c:1.123 Sun Jun 15 12:25:58 2003
+++ php4/ext/hyperwave/hw.c Sun Jun 15 23:05:24 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hw.c,v 1.123 2003/06/15 16:25:58 andrey Exp $ */
+/* $Id: hw.c,v 1.124 2003/06/16 03:05:24 iliaa Exp $ */
#include <stdlib.h>
#include <errno.h>
@@ -1487,7 +1487,7 @@
PHP_FUNCTION(hw_dummy)
{
pval **arg1, **arg2, **arg3;
- int link, id, type, msgid;
+ int link, id, type, msg_id;
hw_connection *ptr;
if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &arg1, &arg2, &arg3) ==
FAILURE) {
@@ -1496,13 +1496,13 @@
convert_to_long_ex(arg2);
convert_to_long_ex(arg3);
id=Z_LVAL_PP(arg2);
- msgid=Z_LVAL_PP(arg3);
+ msg_id=Z_LVAL_PP(arg3);
HW_FETCH_LINK(arg1);
set_swap(ptr->swap_on);
{
char *object = NULL;
- if (0 != (ptr->lasterror = send_dummy(ptr->socket, id, msgid, &object)))
+ if (0 != (ptr->lasterror = send_dummy(ptr->socket, id, msg_id, &object)))
RETURN_FALSE;
php_printf("%s", object);
Index: php4/ext/hyperwave/hg_comm.c
diff -u php4/ext/hyperwave/hg_comm.c:1.56 php4/ext/hyperwave/hg_comm.c:1.57
--- php4/ext/hyperwave/hg_comm.c:1.56 Tue Jun 10 16:03:29 2003
+++ php4/ext/hyperwave/hg_comm.c Sun Jun 15 23:05:24 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hg_comm.c,v 1.56 2003/06/10 20:03:29 imajes Exp $ */
+/* $Id: hg_comm.c,v 1.57 2003/06/16 03:05:24 iliaa Exp $ */
/* #define HW_DEBUG */
@@ -654,7 +654,7 @@
scriptname = emalloc(5*sizeof(char *));
if (zend_hash_find(&EG(symbol_table), "SCRIPT_NAME",
sizeof("SCRIPT_NAME"), (void **) &script_name)==FAILURE)
for(i=0; i<5; i++)
- scriptname[i] = &emptystring;
+ scriptname[i] = (char *) &emptystring;
else {
convert_to_string_ex(script_name);
for(i=0; i<5; i++)
@@ -684,7 +684,7 @@
newtext = text;
bgstr[0] = '\0';
#ifdef newlist
- zend_llist_sort(pAnchorList, fnCmpAnchors TSRMLS_CC);
+ zend_llist_sort(pAnchorList, (llist_compare_func_t) fnCmpAnchors TSRMLS_CC);
ptr = (ANCHOR **) zend_llist_get_last(pAnchorList);
if(ptr)
cur_ptr = *ptr;
@@ -1513,7 +1513,7 @@
return(comm_msg);
}
-int send_dummy(int sockfd, hw_objectID objectID, int msgid, char **attributes)
+int send_dummy(int sockfd, hw_objectID objectID, int msg_id, char **attributes)
{
hg_msg msg, *retmsg;
int length, error;
@@ -1521,7 +1521,7 @@
length = HEADER_LENGTH + sizeof(hw_objectID);
- build_msg_header(&msg, length, msgid++, msgid);
+ build_msg_header(&msg, length, msg_id++, msg_id);
if ( (msg.buf = (char *)emalloc(length-HEADER_LENGTH)) == NULL ) {
/* perror("send_command"); */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
