diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-06-16 03:05:25 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-06-16 03:05:25 +0000 |
| commit | b25c652f959204d77bb7ff5b044f671641738615 (patch) | |
| tree | 5a59edff2fbae8f72fd04c95c7a794d50c0822b2 /ext/hyperwave | |
| parent | 0e4f73ee548026c943a6283045a1731f8e68d340 (diff) | |
| download | php-git-b25c652f959204d77bb7ff5b044f671641738615.tar.gz | |
Fixed a few remaining compiler warnings.
Diffstat (limited to 'ext/hyperwave')
| -rw-r--r-- | ext/hyperwave/hg_comm.c | 8 | ||||
| -rw-r--r-- | ext/hyperwave/hw.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ext/hyperwave/hg_comm.c b/ext/hyperwave/hg_comm.c index 1e52a51a79..488d9ce523 100644 --- 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 812f6cac78..60f97de2e5 100644 --- a/ext/hyperwave/hw.c +++ b/ext/hyperwave/hw.c @@ -1487,7 +1487,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) { @@ -1496,13 +1496,13 @@ PHP_FUNCTION(hw_dummy) 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); |