moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

Fix compiler warnings

Browse Source
This commit is contained in:
Yang Tse 2009-12-14 13:27:50 +00:00
parent 6e9a484ea6
commit 364d76aca7
1 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tests/server/sws.c
View File

@ -91,10 +91,10 @@ static bool prevbounce=FALSE; /* instructs the server to increase the part
struct httprequest { struct httprequest {
char reqbuf[REQBUFSIZ]; /* buffer area for the incoming request */ char reqbuf[REQBUFSIZ]; /* buffer area for the incoming request */
int checkindex; /* where to start checking of the request */ size_t checkindex; /* where to start checking of the request */
int offset; /* size of the incoming request */ size_t offset; /* size of the incoming request */
long testno; /* test number found in the request */ long testno; /* test number found in the request */
long partno; /* part number found in the request */ long partno; /* part number found in the request */
bool open; /* keep connection open info, as found in the request */ bool open; /* keep connection open info, as found in the request */
bool auth_req; /* authentication required, don't wait for body unless bool auth_req; /* authentication required, don't wait for body unless
there's an Authorization header */ there's an Authorization header */
@ -109,12 +109,12 @@ struct httprequest {
bytes said in Content-Length, but the server only reads N bytes said in Content-Length, but the server only reads N
- skip bytes. */ - skip bytes. */
int rcmd; /* doing a special command, see defines above */ int rcmd; /* doing a special command, see defines above */
int prot_version; /* HTTP version * 10 */ int prot_version; /* HTTP version * 10 */
bool pipelining; /* true if request is pipelined */ bool pipelining; /* true if request is pipelined */
}; };
static int ProcessRequest(struct httprequest *req); static int ProcessRequest(struct httprequest *req);
static void storerequest(char *reqbuf, ssize_t totalsize); static void storerequest(char *reqbuf, size_t totalsize);
#define DEFAULT_PORT 8999 #define DEFAULT_PORT 8999
@ -367,7 +367,6 @@ static int ProcessRequest(struct httprequest *req)
sprintf(logbuf, "Requested test number %ld part %ld", sprintf(logbuf, "Requested test number %ld part %ld",
req->testno, req->partno); req->testno, req->partno);
logmsg("%s", logbuf); logmsg("%s", logbuf);
filename = test2file(req->testno); filename = test2file(req->testno);
@ -601,24 +600,18 @@ static int ProcessRequest(struct httprequest *req)
} }
/* store the entire request in a file */ /* store the entire request in a file */
static void storerequest(char *reqbuf, ssize_t totalsize) static void storerequest(char *reqbuf, size_t totalsize)
{ {
int res; int res;
int error = 0; int error = 0;
ssize_t written; size_t written;
ssize_t writeleft; size_t writeleft;
FILE *dump; FILE *dump;
if (reqbuf == NULL) if (reqbuf == NULL)
return; return;
if (totalsize == 0) if (totalsize == 0)
return; return;
else if (totalsize < 0) {
logmsg("Invalid size (%zd bytes) for request input. Not written to %s",
totalsize, REQUEST_DUMP);
return;
}
do { do {
dump = fopen(REQUEST_DUMP, "ab"); dump = fopen(REQUEST_DUMP, "ab");
@ -632,8 +625,8 @@ static void storerequest(char *reqbuf, ssize_t totalsize)
writeleft = totalsize; writeleft = totalsize;
do { do {
written = (ssize_t)fwrite((void *) &reqbuf[totalsize-writeleft], written = fwrite(&reqbuf[totalsize-writeleft],
1, (size_t)writeleft, dump); 1, writeleft, dump);
if(got_exit_signal) if(got_exit_signal)
goto storerequest_cleanup; goto storerequest_cleanup;
if(written > 0) if(written > 0)
@ -641,11 +634,11 @@ static void storerequest(char *reqbuf, ssize_t totalsize)
} while ((writeleft > 0) && ((error = ERRNO) == EINTR)); } while ((writeleft > 0) && ((error = ERRNO) == EINTR));
if(writeleft == 0) if(writeleft == 0)
logmsg("Wrote request (%zd bytes) input to " REQUEST_DUMP, totalsize); logmsg("Wrote request (%zu bytes) input to " REQUEST_DUMP, totalsize);
else if(writeleft > 0) { else if(writeleft > 0) {
logmsg("Error writing file %s error: %d %s", logmsg("Error writing file %s error: %d %s",
REQUEST_DUMP, error, strerror(error)); REQUEST_DUMP, error, strerror(error));
logmsg("Wrote only (%zd bytes) of (%zd bytes) request input to %s", logmsg("Wrote only (%zu bytes) of (%zu bytes) request input to %s",
totalsize-writeleft, totalsize, REQUEST_DUMP); totalsize-writeleft, totalsize, REQUEST_DUMP);
} }
@ -669,7 +662,7 @@ static int get_request(curl_socket_t sock, struct httprequest *req)
ssize_t got = 0; ssize_t got = 0;
char *pipereq = NULL; char *pipereq = NULL;
int pipereq_length = 0; size_t pipereq_length = 0;
if(req->pipelining) { if(req->pipelining) {
pipereq = reqbuf + req->checkindex; pipereq = reqbuf + req->checkindex;
@ -731,7 +724,7 @@ static int get_request(curl_socket_t sock, struct httprequest *req)
logmsg("Read %zd bytes", got); logmsg("Read %zd bytes", got);
req->offset += (int)got; req->offset += (size_t)got;
reqbuf[req->offset] = '\0'; reqbuf[req->offset] = '\0';
done_processing = ProcessRequest(req); done_processing = ProcessRequest(req);
@ -849,8 +842,6 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
buffer = doc404; buffer = doc404;
break; break;
} }
ptr = NULL;
stream=NULL;
count = strlen(buffer); count = strlen(buffer);
} }
@ -910,7 +901,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
else else
prevbounce = FALSE; prevbounce = FALSE;
dump = fopen(RESPONSE_DUMP, "ab"); /* b is for windows-preparing */ dump = fopen(RESPONSE_DUMP, "ab");
if(!dump) { if(!dump) {
error = ERRNO; error = ERRNO;
logmsg("fopen() failed with error: %d %s", error, strerror(error)); logmsg("fopen() failed with error: %d %s", error, strerror(error));