[PHP-CVS] cvs: php4(PHP_4_3) /ext/hyperwave hg_comm.c hw.c

[Ilia Alshanetsky]

iliaa           Sun Jun 15 23:07:07 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/hyperwave hg_comm.c hw.c 
  Log:
  MFH: compiler warnings
  
  
Index: php4/ext/hyperwave/hg_comm.c
diff -u php4/ext/hyperwave/hg_comm.c:1.52.8.2 php4/ext/hyperwave/hg_comm.c:1.52.8.3
--- php4/ext/hyperwave/hg_comm.c:1.52.8.2       Thu Jun  5 19:48:16 2003
+++ php4/ext/hyperwave/hg_comm.c        Sun Jun 15 23:07:07 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: hg_comm.c,v 1.52.8.2 2003/06/05 23:48:16 iliaa Exp $ */
+/* $Id: hg_comm.c,v 1.52.8.3 2003/06/16 03:07:07 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"); */
Index: php4/ext/hyperwave/hw.c
diff -u php4/ext/hyperwave/hw.c:1.111.2.3 php4/ext/hyperwave/hw.c:1.111.2.4
--- php4/ext/hyperwave/hw.c:1.111.2.3   Tue Mar  4 14:00:02 2003
+++ php4/ext/hyperwave/hw.c     Sun Jun 15 23:07:07 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: hw.c,v 1.111.2.3 2003/03/04 19:00:02 sniper Exp $ */
+/* $Id: hw.c,v 1.111.2.4 2003/06/16 03:07:07 iliaa Exp $ */
 
 #include <stdlib.h>
 #include <errno.h>
@@ -1512,7 +1512,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) {
@@ -1523,7 +1523,7 @@
        convert_to_long_ex(arg3);
        link=Z_LVAL_PP(arg1);
        id=Z_LVAL_PP(arg2);
-       msgid=Z_LVAL_PP(arg3);
+       msg_id=Z_LVAL_PP(arg3);
        ptr = zend_list_find(link, &type);
        if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
                php_error(E_WARNING, "%s(): Unable to find file identifier %d", 
get_active_function_name(TSRMLS_C), id);
@@ -1533,7 +1533,7 @@
        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);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php