MFH: compiler warnings

diff --git a/ext/hyperwave/hg_comm.c b/ext/hyperwave/hg_comm.c
index 5aaae3dcfd2612d9ced2165c64653ae11c91e11f..567ae5f7b3595e4267c12623e260470ed5519379 100644 (file)
--- a/ext/hyperwave/hg_comm.c
+++ b/ext/hyperwave/hg_comm.c
@@ -654,7 +654,7 @@ char *fnInsAnchorsIntoText(char *text, DLIST *pAnchorList, char **bodytag, char
                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 @@ char *fnInsAnchorsIntoText(char *text, DLIST *pAnchorList, char **bodytag, char
        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 @@ hg_msg *recv_command(int sockfd)
        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 @@ int send_dummy(int sockfd, hw_objectID objectID, int msgid, char **attributes)
 
        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"); */

diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c
index eb4d508c96ce93b1b90903ed4e5ad54f2a9db085..3750c79126f3d9885c9f4ffc08fe073ef541d34b 100644 (file)
--- a/ext/hyperwave/hw.c
+++ b/ext/hyperwave/hw.c
@@ -1512,7 +1512,7 @@ php_printf("%s\n", ptr);
 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 @@ PHP_FUNCTION(hw_dummy)
        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 @@ PHP_FUNCTION(hw_dummy)
        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);