From 402e8748593a42cf6d42fda772f207e3e9300a3e Mon Sep 17 00:00:00 2001 From: snowdrop Date: Tue, 2 Nov 2004 23:09:19 +0000 Subject: dos2unix --- nanohttp/nanohttp-stream.c | 88 +++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'nanohttp/nanohttp-stream.c') diff --git a/nanohttp/nanohttp-stream.c b/nanohttp/nanohttp-stream.c index 1951c8a..3f0a9e9 100755 --- a/nanohttp/nanohttp-stream.c +++ b/nanohttp/nanohttp-stream.c @@ -1,5 +1,5 @@ /****************************************************************** -* $Id: nanohttp-stream.c,v 1.5 2004/10/29 09:27:05 snowdrop Exp $ +* $Id: nanohttp-stream.c,v 1.6 2004/11/02 23:09:27 snowdrop Exp $ * * CSOAP Project: A http client/server library in C * Copyright (C) 2003-2004 Ferhat Ayaz @@ -132,7 +132,7 @@ http_input_stream_t *http_input_stream_new_from_file(const char* filename) result = (http_input_stream_t*)malloc(sizeof(http_input_stream_t)); result->type = HTTP_TRANSFER_FILE; result->fd = fd; - result->deleteOnExit = 0; + result->deleteOnExit = 0; strcpy(result->filename, filename); return result; } @@ -142,11 +142,11 @@ http_input_stream_t *http_input_stream_new_from_file(const char* filename) */ void http_input_stream_free(http_input_stream_t *stream) { - if (stream->type == HTTP_TRANSFER_FILE && stream->fd) { - fclose(stream->fd); - if (stream->deleteOnExit) - log_info2("Removing '%s'", stream->filename); - /*remove(stream->filename);*/ + if (stream->type == HTTP_TRANSFER_FILE && stream->fd) { + fclose(stream->fd); + if (stream->deleteOnExit) + log_info2("Removing '%s'", stream->filename); + /*remove(stream->filename);*/ } free(stream); @@ -185,7 +185,7 @@ static int _http_input_stream_content_length_read( http_input_stream_t *stream, byte_t *dest, int size) { - herror_t status; + herror_t status; int read; /* check limit */ @@ -209,20 +209,20 @@ int _http_input_stream_chunked_read_chunk_size( { char chunk[25]; int status, i = 0; - int chunk_size; + int chunk_size; herror_t err; while (1) { - err = hsocket_read(stream->sock, &(chunk[i]), 1, 1, &status); - if (status != 1) { - stream->err = herror_new("_http_input_stream_chunked_read_chunk_size", - GENERAL_INVALID_PARAM, "This should never happens!"); - return -1; + err = hsocket_read(stream->sock, &(chunk[i]), 1, 1, &status); + if (status != 1) { + stream->err = herror_new("_http_input_stream_chunked_read_chunk_size", + GENERAL_INVALID_PARAM, "This should never happens!"); + return -1; } - if (err != H_OK) { - log_error4("[%d] %s(): %s ", herror_code(err), herror_func(err), herror_message(err)); + if (err != H_OK) { + log_error4("[%d] %s(): %s ", herror_code(err), herror_func(err), herror_message(err)); stream->err = err; return -1; @@ -235,16 +235,16 @@ int _http_input_stream_chunked_read_chunk_size( else if (chunk[i] == '\n') { chunk[i] = '\0'; /* double check*/ - chunk_size = strtol(chunk, (char **) NULL, 16); /* hex to dec */ + chunk_size = strtol(chunk, (char **) NULL, 16); /* hex to dec */ /* - log_verbose3("chunk_size: '%s' as dec: '%d'", chunk, chunk_size); + log_verbose3("chunk_size: '%s' as dec: '%d'", chunk, chunk_size); */ return chunk_size; } if (i == 24) { - stream->err = herror_new( - "_http_input_stream_chunked_read_chunk_size", STREAM_ERROR_NO_CHUNK_SIZE, + stream->err = herror_new( + "_http_input_stream_chunked_read_chunk_size", STREAM_ERROR_NO_CHUNK_SIZE, "reached max line == %d", i); return -1; } @@ -253,10 +253,10 @@ int _http_input_stream_chunked_read_chunk_size( } /* this should never happens */ - stream->err = herror_new( - "_http_input_stream_chunked_read_chunk_size", STREAM_ERROR_NO_CHUNK_SIZE, - "reached max line == %d", i); - return -1; + stream->err = herror_new( + "_http_input_stream_chunked_read_chunk_size", STREAM_ERROR_NO_CHUNK_SIZE, + "reached max line == %d", i); + return -1; } static @@ -265,7 +265,7 @@ int _http_input_stream_chunked_read( { int status, counter; int remain, read=0; - char ch; + char ch; herror_t err; while (size > 0) @@ -291,7 +291,7 @@ int _http_input_stream_chunked_read( break; } if (counter-- == 0) { - stream->err = herror_new("_http_input_stream_chunked_read", + stream->err = herror_new("_http_input_stream_chunked_read", STREAM_ERROR_WRONG_CHUNK_SIZE,"Wrong chunk-size"); return -1; } @@ -320,27 +320,27 @@ int _http_input_stream_chunked_read( /* show remaining chunk size in socket */ if (remain < size) { - /* read from socket */ + /* read from socket */ err = hsocket_read(stream->sock, &(dest[read]), remain, 1, &status); - if (err != H_OK) { - stream->err = err; - return -1; - } - if (status != remain) { - stream->err = herror_new("_http_input_stream_chunked_read", - GENERAL_INVALID_PARAM, "This should never happens(remain=%d)(status=%d)!", remain, status); - return -1; - } + if (err != H_OK) { + stream->err = err; + return -1; + } + if (status != remain) { + stream->err = herror_new("_http_input_stream_chunked_read", + GENERAL_INVALID_PARAM, "This should never happens(remain=%d)(status=%d)!", remain, status); + return -1; + } } else { /* read from socket */ err = hsocket_read(stream->sock, &(dest[read]), size, 1, &status); - if (status != size) { - stream->err = herror_new("_http_input_stream_chunked_read", - GENERAL_INVALID_PARAM, "This should never happens(size=%d)(status=%d)!", size, status); - return -1; - } + if (status != size) { + stream->err = herror_new("_http_input_stream_chunked_read", + GENERAL_INVALID_PARAM, "This should never happens(size=%d)(status=%d)!", size, status); + return -1; + } if (err != H_OK) { stream->err = err; return -1; @@ -361,7 +361,7 @@ int _http_input_stream_connection_closed_read( http_input_stream_t *stream, byte_t *dest, int size) { int status; - herror_t err; + herror_t err; /* read from socket */ err = hsocket_read(stream->sock, dest, size, 0, &status ); @@ -386,7 +386,7 @@ int _http_input_stream_file_read( readed = fread(dest, 1, size, stream->fd); if (readed == -1) { - stream->err = herror_new("_http_input_stream_file_read", + stream->err = herror_new("_http_input_stream_file_read", HSOCKET_ERROR_RECEIVE, "fread() returned -1"); return -1; } @@ -453,7 +453,7 @@ int http_input_stream_read(http_input_stream_t *stream, readed=_http_input_stream_file_read(stream, dest, size); break; default: - stream->err = herror_new("http_input_stream_read", + stream->err = herror_new("http_input_stream_read", STREAM_ERROR_INVALID_TYPE, "%d is invalid stream type", stream->type); return -1; } -- cgit v1.1-32-gdbae