diff options
| author | Stefan Bühler <stbuehler@web.de> | 2008-07-30 19:38:32 +0000 |
|---|---|---|
| committer | Stefan Bühler <stbuehler@web.de> | 2008-07-30 19:38:32 +0000 |
| commit | 52861d77dfe4e470cac6114cd9f335b30a88b9f5 (patch) | |
| tree | 3d05443ad7a0efcefcbcbc46c5a76c202e53af14 /src/mod_uploadprogress.c | |
| parent | 0c8ebbeb606561da6acb4d576fb8ab24571fa2dc (diff) | |
| download | lighttpd-git-52861d77dfe4e470cac6114cd9f335b30a88b9f5.tar.gz | |
Replace buffer_{append,copy}_string with the _len variant where possible (#1732, thx crypt)
Replace BUFFER_{APPEND,COPY}_STRING_CONST with _len(b, CONST_STRL_LEN(x))
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2250 152afb58-edef-0310-8abb-c4023f1b3aa9
Diffstat (limited to 'src/mod_uploadprogress.c')
| -rw-r--r-- | src/mod_uploadprogress.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/mod_uploadprogress.c b/src/mod_uploadprogress.c index 30633574..0d13d29d 100644 --- a/src/mod_uploadprogress.c +++ b/src/mod_uploadprogress.c @@ -363,7 +363,7 @@ URIHANDLER_FUNC(mod_uploadprogress_uri_handler) { b = chunkqueue_get_append_buffer(con->write_queue); - BUFFER_APPEND_STRING_CONST(b, "starting"); + buffer_append_string_len(b, CONST_STR_LEN("starting")); return HANDLER_FINISHED; } @@ -378,15 +378,18 @@ URIHANDLER_FUNC(mod_uploadprogress_uri_handler) { b = chunkqueue_get_append_buffer(con->write_queue); /* prepare XML */ - BUFFER_COPY_STRING_CONST(b, "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>"); - BUFFER_APPEND_STRING_CONST(b, "<upload>"); - BUFFER_APPEND_STRING_CONST(b, "<size>"); + buffer_copy_string_len(b, CONST_STR_LEN( + "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>" + "<upload>" + "<size>")); buffer_append_off_t(b, post_con->request.content_length); - BUFFER_APPEND_STRING_CONST(b, "</size>"); - BUFFER_APPEND_STRING_CONST(b, "<received>"); + buffer_append_string_len(b, CONST_STR_LEN( + "</size>" + "<received>")); buffer_append_off_t(b, post_con->request_content_queue->bytes_in); - BUFFER_APPEND_STRING_CONST(b, "</received>"); - BUFFER_APPEND_STRING_CONST(b, "</upload>"); + buffer_append_string_len(b, CONST_STR_LEN( + "</received>" + "</upload>")); log_error_write(srv, __FILE__, __LINE__, "sb", "...", b); |