Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

git-svn-id: svn://cherokee-project.com/cherokee/trunk@1175 5dc97367-9…

…7f1-0310-9951-d761b3857238
  • Loading branch information...
commit d5e94a6c1744aad0d43c763c5e094c6099ddb556 1 parent f54e20d
Alvaro Lopez Ortega alobbs authored
2  cherokee/buffer.c
View
@@ -909,7 +909,7 @@ cherokee_buffer_read_from_fd (cherokee_buffer_t *buf, int fd, size_t size, size_
return ret_eof;
}
- /* Add readed length, terminate buffer and return
+ /* Add read length, terminate buffer and return
*/
*ret_size = len;
buf->len += len;
16 cherokee/downloader.c
View
@@ -295,11 +295,11 @@ downloader_header_read (cherokee_downloader_t *downloader, cherokee_buffer_t *tm
{
ret_t ret;
cuint_t len;
- size_t readed = 0;
- cherokee_socket_t *sock = &downloader->socket;
+ size_t read_ = 0;
+ cherokee_socket_t *sock = &downloader->socket;
cherokee_http_t error_code = http_bad_request;
- ret = cherokee_socket_bufread (sock, &downloader->reply_header, DEFAULT_RECV_SIZE, &readed);
+ ret = cherokee_socket_bufread (sock, &downloader->reply_header, DEFAULT_RECV_SIZE, &read_);
switch (ret) {
case ret_eof:
return ret_eof;
@@ -310,7 +310,7 @@ downloader_header_read (cherokee_downloader_t *downloader, cherokee_buffer_t *tm
case ret_ok:
/* Count
*/
- downloader->info.headers_recv += readed;
+ downloader->info.headers_recv += read_;
/* Check the header. Is it complete?
*/
@@ -387,10 +387,10 @@ static ret_t
downloader_step (cherokee_downloader_t *downloader)
{
ret_t ret;
- size_t readed = 0;
- cherokee_socket_t *sock = &downloader->socket;
+ size_t read_ = 0;
+ cherokee_socket_t *sock = &downloader->socket;
- ret = cherokee_socket_bufread (sock, &downloader->body, DEFAULT_RECV_SIZE, &readed);
+ ret = cherokee_socket_bufread (sock, &downloader->body, DEFAULT_RECV_SIZE, &read_);
switch (ret) {
case ret_eagain:
return ret_eagain;
@@ -398,7 +398,7 @@ downloader_step (cherokee_downloader_t *downloader)
case ret_ok:
/* Count
*/
- downloader->info.body_recv += readed;
+ downloader->info.body_recv += read_;
/* Has it finished?
*/
2  cherokee/fcgi_manager.c
View
@@ -438,7 +438,7 @@ cherokee_fcgi_manager_step (cherokee_fcgi_manager_t *mgr)
ret = cherokee_socket_bufread (&mgr->socket, &mgr->read_buffer, DEFAULT_READ_SIZE, &size);
switch (ret) {
case ret_ok:
- TRACE (ENTRIES, "%d bytes readed\n", size);
+ TRACE (ENTRIES, "%d bytes read\n", size);
break;
case ret_eof:
10 cherokee/handler_cgi.c
View
@@ -80,14 +80,14 @@ static ret_t
read_from_cgi (cherokee_handler_cgi_base_t *cgi_base, cherokee_buffer_t *buffer)
{
ret_t ret;
- size_t readed = 0;
- cherokee_handler_cgi_t *cgi = HDL_CGI(cgi_base);
+ size_t read_ = 0;
+ cherokee_handler_cgi_t *cgi = HDL_CGI(cgi_base);
/* Read the data from the pipe:
*/
- ret = cherokee_buffer_read_from_fd (buffer, cgi->pipeInput, 4096, &readed);
+ ret = cherokee_buffer_read_from_fd (buffer, cgi->pipeInput, 4096, &read_);
- TRACE (ENTRIES, "read... ret=%d %d\n", ret, readed);
+ TRACE (ENTRIES, "read... ret=%d %d\n", ret, read_);
switch (ret) {
case ret_eagain:
@@ -95,7 +95,7 @@ read_from_cgi (cherokee_handler_cgi_base_t *cgi_base, cherokee_buffer_t *buffer)
return ret_eagain;
case ret_ok:
- TRACE (ENTRIES, "%d bytes read\n", readed);
+ TRACE (ENTRIES, "%d bytes read\n", read_);
return ret_ok;
case ret_eof:
4 cherokee/handler_dirlist.c
View
@@ -998,7 +998,7 @@ cherokee_handler_dirlist_step (cherokee_handler_dirlist_t *dhdl, cherokee_buffer
render_file (dhdl, buffer, (file_entry_t *)dhdl->dir_ptr);
dhdl->dir_ptr = dhdl->dir_ptr->next;
- /* Maybe it has readed enough data
+ /* Maybe it has read enough data
*/
if (buffer->len > DEFAULT_READ_SIZE)
return ret_ok;
@@ -1014,7 +1014,7 @@ cherokee_handler_dirlist_step (cherokee_handler_dirlist_t *dhdl, cherokee_buffer
render_file (dhdl, buffer, (file_entry_t *) dhdl->file_ptr);
dhdl->file_ptr = dhdl->file_ptr->next;
- /* Maybe it has readed enough data
+ /* Maybe it has read enough data
*/
if (buffer->len > DEFAULT_READ_SIZE)
return ret_ok;
2  cherokee/handler_fcgi.c
View
@@ -182,7 +182,7 @@ read_from_fcgi (cherokee_handler_cgi_base_t *cgi, cherokee_buffer_t *buffer)
case ret_ok:
ret = process_buffer (fcgi, &fcgi->write_buffer, buffer);
- TRACE (ENTRIES, "%d bytes readed, buffer.len %d\n", read, buffer->len);
+ TRACE (ENTRIES, "%d bytes read, buffer.len %d\n", read, buffer->len);
if ((ret == ret_ok) && cgi->got_eof && (buffer->len > 0))
return ret_eof_have_data;
return ret;
2  cherokee/handler_mirror.c
View
@@ -280,7 +280,7 @@ cherokee_handler_mirror_step (cherokee_handler_mirror_t *hdl, cherokee_buffer_t
ret = cherokee_socket_bufread (&hdl->socket, buffer, DEFAULT_READ_SIZE, &got);
switch (ret) {
case ret_ok:
- TRACE (ENTRIES, "%d bytes readed\n", got);
+ TRACE (ENTRIES, "%d bytes read\n", got);
return ret_ok;
case ret_eagain:
2  cherokee/handler_scgi.c
View
@@ -139,7 +139,7 @@ read_from_scgi (cherokee_handler_cgi_base_t *cgi_base, cherokee_buffer_t *buffer
return ret_eagain;
case ret_ok:
- TRACE (ENTRIES, "%d bytes readed\n", read);
+ TRACE (ENTRIES, "%d bytes read\n", read);
return ret_ok;
case ret_eof:
Please sign in to comment.
Something went wrong with that request. Please try again.