diff options
| author | Uwe Steinmann <steinm@php.net> | 2000-02-02 11:18:06 +0000 |
|---|---|---|
| committer | Uwe Steinmann <steinm@php.net> | 2000-02-02 11:18:06 +0000 |
| commit | 22c5c021f026034ad638addf68cfd39f0e4eeeed (patch) | |
| tree | a5fc9849c9d4b030f3e479a99d8b910b82d287e3 /ext/hyperwave | |
| parent | f0f00daa9269bb0415aa6d7f20ceff3d05a7c804 (diff) | |
| download | php-git-22c5c021f026034ad638addf68cfd39f0e4eeeed.tar.gz | |
- several minor cleanups like removing unused variables
Diffstat (limited to 'ext/hyperwave')
| -rw-r--r-- | ext/hyperwave/hg_comm.c | 16 | ||||
| -rw-r--r-- | ext/hyperwave/hw.c | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/ext/hyperwave/hg_comm.c b/ext/hyperwave/hg_comm.c index 7a454e52fd..1138df59b6 100644 --- a/ext/hyperwave/hg_comm.c +++ b/ext/hyperwave/hg_comm.c @@ -776,9 +776,9 @@ static int set_noblock(int fd) int write_to(int fd, void *buffer, int n, int timeout) { - int nrem, nw; + int nrem, nw=0; char *bptr; - int error; + int error=0; #if defined(SYSV) || (WIN32|WINNT) int width = 20; #else @@ -812,7 +812,7 @@ int write_to(int fd, void *buffer, int n, int timeout) (fd_set *) 0, &select_timeout)) <= 0 && errno != EINTR) break; - if(errno != EINTR && ( nw = write(fd, bptr, nrem)) <= 0) { + if(errno != EINTR && ( nw = write(fd, bptr, nrem)) <= 0) { /* * check for error number - and keep trying to * write @@ -846,9 +846,9 @@ int write_to(int fd, void *buffer, int n, int timeout) int read_to(int fd, char *buffer, int n, int timeout) { - int nrem, nread, nr; + int nrem, nread, nr=0; char *bptr; - int error; + int error=0; #if defined(SYSV) || (WIN32|WINNT) int width = 20; @@ -1608,7 +1608,7 @@ int send_insertobject(int sockfd, char *objrec, char *parms, hw_objectID *object int send_unlock(int sockfd, hw_objectID objectID) { hg_msg msg; - int length, error; + int length; char *tmp; length = HEADER_LENGTH + sizeof(hw_objectID); @@ -4691,9 +4691,9 @@ int send_getsrcbydest(int sockfd, hw_objectID objectID, char ***childrec, int *c int send_mapid(int sockfd, int servid, hw_objectID id, int *virtid) { hg_msg msg, *retmsg; - int length, i, error; + int length, error; char *tmp; - int *ptr, *ptr1; + int *ptr; length = HEADER_LENGTH + 2 * sizeof(hw_objectID); diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c index 6448431917..5ade1d45d4 100644 --- a/ext/hyperwave/hw.c +++ b/ext/hyperwave/hw.c @@ -283,7 +283,6 @@ int make_return_objrec(pval **return_value, char **objrecs, int count) */ int make2_return_array_from_objrec(pval **return_value, char *objrec, zval *sarr) { char *attrname, *str, *temp, language[3]; - int i, count; zval *spec_arr; char *strtok_buf = NULL; @@ -1500,7 +1499,6 @@ PHP_FUNCTION(hw_changeobject) { int link, id, type, i; hw_connection *ptr; char *modification, *oldobjrec, buf[BUFFERLEN]; - char *tmp; HashTable *newobjarr; if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) { @@ -2926,7 +2924,7 @@ PHP_FUNCTION(hw_docbyanchor) { int link, id, type; hw_connection *ptr; - if (ARG_COUNT(ht) != 2 || getParameters(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); |