minor variable type cleanups

This commit is contained in:
Daniel Stenberg 2004-03-23 08:50:28 +00:00
parent 4e84ac4db8
commit 0fd88d7c8f
3 changed files with 9 additions and 8 deletions

View File

@ -65,7 +65,7 @@ char *appendstring(char *string, /* original string */
const char *spitout(FILE *stream, const char *spitout(FILE *stream,
const char *main, const char *main,
const char *sub, int *size) const char *sub, size_t *size)
{ {
char buffer[8192]; /* big enough for anything */ char buffer[8192]; /* big enough for anything */
char cmain[128]=""; /* current main section */ char cmain[128]=""; /* current main section */

View File

@ -23,4 +23,5 @@
const char * const char *
spitout(FILE *stream, spitout(FILE *stream,
const char *main, const char *main,
const char *sub, int *size); const char *sub,
size_t *size);

View File

@ -77,7 +77,7 @@
struct httprequest { struct httprequest {
char reqbuf[REQBUFSIZ]; /* buffer area for the incoming request */ char reqbuf[REQBUFSIZ]; /* buffer area for the incoming request */
int offset; /* size of the incoming request */ int offset; /* size of the incoming request */
int testno; /* test number found in the request */ long testno; /* test number found in the request */
int partno; /* part number found in the request */ int partno; /* part number found in the request */
int open; /* keep connection open info, as found in the request */ int 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
@ -227,7 +227,7 @@ int ProcessRequest(struct httprequest *req)
FILE *stream; FILE *stream;
char *filename; char *filename;
char *cmd = NULL; char *cmd = NULL;
int cmdsize = 0; size_t cmdsize = 0;
if((strlen(doc) + strlen(request)) < 200) if((strlen(doc) + strlen(request)) < 200)
sprintf(logbuf, "Got request: %s %s HTTP/%d.%d", sprintf(logbuf, "Got request: %s %s HTTP/%d.%d",
@ -260,7 +260,7 @@ int ProcessRequest(struct httprequest *req)
else else
req->partno = 0; req->partno = 0;
sprintf(logbuf, "Reqested test number %d part %d", sprintf(logbuf, "Reqested test number %ld part %d",
req->testno, req->partno); req->testno, req->partno);
logmsg(logbuf); logmsg(logbuf);
@ -474,12 +474,12 @@ static int get_request(int sock, struct httprequest *req)
static int send_doc(int sock, struct httprequest *req) static int send_doc(int sock, struct httprequest *req)
{ {
int written; int written;
int count; size_t count;
const char *buffer; const char *buffer;
char *ptr; char *ptr;
FILE *stream; FILE *stream;
char *cmd=NULL; char *cmd=NULL;
int cmdsize=0; size_t cmdsize=0;
FILE *dump; FILE *dump;
int persistant = TRUE; int persistant = TRUE;
@ -659,7 +659,7 @@ int main(int argc, char *argv[])
struct httprequest req; struct httprequest req;
if(argc>1) { if(argc>1) {
port = atoi(argv[1]); port = (unsigned short)atoi(argv[1]);
if(argc>2) { if(argc>2) {
path = argv[2]; path = argv[2];