summaryrefslogtreecommitdiff
path: root/ext/hyperwave/hg_comm.c
diff options
context:
space:
mode:
authorUwe Steinmann <steinm@php.net>2001-06-06 14:48:01 +0000
committerUwe Steinmann <steinm@php.net>2001-06-06 14:48:01 +0000
commit85d3d3e199924a3049262a4320b6a97171ba51ad (patch)
tree5842fb9d1f1801813e922e6bfda066af4fbc5ca1 /ext/hyperwave/hg_comm.c
parent9c5588213372575ced9bdd5cc4ae1f4e7e2dd81e (diff)
downloadphp-git-85d3d3e199924a3049262a4320b6a97171ba51ad.tar.gz
- fixed some compiler warnings
Diffstat (limited to 'ext/hyperwave/hg_comm.c')
-rw-r--r--ext/hyperwave/hg_comm.c33
1 files changed, 14 insertions, 19 deletions
diff --git a/ext/hyperwave/hg_comm.c b/ext/hyperwave/hg_comm.c
index a1aaf14154..aca2956253 100644
--- a/ext/hyperwave/hg_comm.c
+++ b/ext/hyperwave/hg_comm.c
@@ -71,10 +71,10 @@
#define hw_less_server_stress
static int set_nonblocking(int fd);
-static int set_blocking(int fd);
+/* static int set_blocking(int fd); */
static int hg_read_exact(int sockfd, char *buf, int size);
-static int hg_read(int sockfd, char *buf, int size);
+/* static int hg_read(int sockfd, char *buf, int size); */
static int hg_write(int sockfd, char *buf, int size);
static int send_hg_msg(int sockfd, hg_msg *msg, int length);
@@ -375,7 +375,7 @@ DLIST *fnCreateAnchorList(hw_objectID objID, char **anchors, char **docofanchorr
In such a case the Position has the value 'invisible' */
str = strstr(object, "Position");
str += 9;
- if((str != 9) && (0 != strncmp(str, "invisible", 9))) {
+ if(((int) str != 9) && (0 != strncmp(str, "invisible", 9))) {
sscanf(str, "0x%X 0x%X", &start, &end);
/* Determine ObjectID */
@@ -1318,6 +1318,7 @@ static int set_nonblocking(int fd)
}
+/*
static int set_blocking(int fd)
{
#ifdef PHP_WIN32
@@ -1331,7 +1332,7 @@ static int set_blocking(int fd)
#endif
return(0);
}
-
+*/
static int hg_read_exact(int sockfd, char *buf, int size)
{
@@ -1343,7 +1344,7 @@ static int hg_read_exact(int sockfd, char *buf, int size)
return(len);
}
-
+/*
static int hg_read(int sockfd, char *buf, int size)
{
int try = 0;
@@ -1364,7 +1365,7 @@ static int hg_read(int sockfd, char *buf, int size)
}
return(len);
}
-
+*/
static int hg_write(int sockfd, char *buf, int size)
{
@@ -2190,7 +2191,7 @@ int send_gettext(int sockfd, hw_objectID objectID, int mode, int rootid, char **
return(0);
}
-send_insertanchors(char **text, int *count, char **anchors, char **destrec, int ancount, char **urlprefix, char **bodytag) {
+int send_insertanchors(char **text, int *count, char **anchors, char **destrec, int ancount, char **urlprefix, char **bodytag) {
char **reldestrec = NULL;
int mode = 0;
hw_objectID objectID = 0;
@@ -2789,7 +2790,7 @@ int send_childrenobj(int sockfd, hw_objectID objectID, char ***childrec, int *co
{
hg_msg msg, *retmsg;
int length, i, error;
- char *tmp, **objptr;
+ char *tmp;
int *childIDs = NULL;
int *ptr;
@@ -2968,7 +2969,7 @@ int send_getchildcollobj(int sockfd, hw_objectID objectID, char ***childrec, int
{
hg_msg msg, *retmsg;
int length, i, error;
- char *tmp, **objptr;
+ char *tmp;
int *childIDs = NULL;
int *ptr;
@@ -3146,8 +3147,8 @@ int send_getchilddoccoll(int sockfd, hw_objectID objectID, hw_objectID **childID
int send_getchilddoccollobj(int sockfd, hw_objectID objectID, hw_objrec ***childrec, int *count)
{
hg_msg msg, *retmsg;
- int length, i, error;
- char *tmp, **objptr;
+ int length, error;
+ char *tmp;
int *childIDs = NULL;
length = HEADER_LENGTH + sizeof(hw_objectID);
@@ -3322,7 +3323,6 @@ int send_getanchorsobj(int sockfd, hw_objectID objectID, char ***childrec, int *
char *tmp;
int *ptr, i, *ptr1;
int *anchorIDs = NULL;
- char **objptr;
length = HEADER_LENGTH + sizeof(hw_objectID);
@@ -3812,9 +3812,9 @@ int send_identify(int sockfd, char *name, char *passwd, char **userdata) {
int send_objectbyidquery(int sockfd, hw_objectID *IDs, int *count, char *query, char ***objrecs)
{
hg_msg msg, *retmsg;
- int length, error;
+ int length;
char *tmp, *str;
- int *ptr, i, *ptr1;
+ int *ptr, i;
int *offsets, *childIDs;
char **childrec;
@@ -4056,7 +4056,6 @@ int send_getobjbyqueryobj(int sockfd, char *query, int maxhits, char ***childrec
int length, i, error;
char *tmp;
int *childIDs = NULL;
- char **objptr;
int *ptr, *ptr1;
length = HEADER_LENGTH + strlen(query) + 1;
@@ -4239,7 +4238,6 @@ int send_getobjbyquerycollobj(int sockfd, hw_objectID collID, char *query, int m
int length, i, error;
char *tmp;
hw_objectID *childIDs = NULL;
- char **objptr;
int *ptr, *ptr1;
length = HEADER_LENGTH + strlen(query) + 1 + sizeof(int) + sizeof(hw_objectID);
@@ -4445,7 +4443,6 @@ int send_getobjbyftqueryobj(int sockfd, char *query, int maxhits, char ***childr
int length, i, error;
char *tmp;
int *childIDs = NULL;
- char **objptr;
int *ptr, *ptr1;
float *ptr2;
@@ -4679,7 +4676,6 @@ int send_getobjbyftquerycollobj(int sockfd, hw_objectID collID, char *query, int
int length, i, error;
char *tmp;
hw_objectID *childIDs = NULL;
- char **objptr;
int *ptr, *ptr1;
float *ptr2;
@@ -4890,7 +4886,6 @@ int send_getparentsobj(int sockfd, hw_objectID objectID, char ***childrec, int *
int length, i, error;
char *tmp;
hw_objectID *childIDs = NULL;
- char **objptr;
int *ptr;
length = HEADER_LENGTH + sizeof(hw_objectID);