aniani/icecast-common
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-common.git synced 2024-12-04 14:46:31 -05:00
Code

Cleanup: removed all the debug stuff left over from last commit

Browse Source
This commit is contained in:
Philipp Schafft 2015-02-10 21:15:14 +00:00
parent ea8dde3202
commit f5d9d955a2
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
httpp/encoding.c
View File

@ -83,8 +83,6 @@ ssize_t __copy_buffer(void *dst, void **src, size_t *boffset, size_t *blen, size
todo = len < have_len ? len : have_len; todo = len < have_len ? len : have_len;
fprintf(stderr, "len=%zu, *blen=%zu, *boffset=%zu, todo=%zu\n", len, *blen, *boffset, todo);
memcpy(dst, p, todo); memcpy(dst, p, todo);
*boffset += todo; *boffset += todo;
@ -485,7 +483,6 @@ static ssize_t __enc_chunked_read(httpp_encoding_t *self, void *buf, size_t len,
if (self->read_bytes_till_header > 2) { if (self->read_bytes_till_header > 2) {
size_t todo = len > (self->read_bytes_till_header - 2) ? (self->read_bytes_till_header - 2) : len; size_t todo = len > (self->read_bytes_till_header - 2) ? (self->read_bytes_till_header - 2) : len;
ret = cb(userdata, buf, todo); ret = cb(userdata, buf, todo);
fprintf(stderr, "%zu bytes to go, %zu bytes todo, %zi bytes got from backend\n", self->read_bytes_till_header, todo, ret);
if (ret < 1) if (ret < 1)
return ret; return ret;
self->read_bytes_till_header -= ret; self->read_bytes_till_header -= ret;
@ -519,7 +516,6 @@ static ssize_t __enc_chunked_read(httpp_encoding_t *self, void *buf, size_t len,
} }
self->buf_read_raw_len += ret; self->buf_read_raw_len += ret;
fprintf(stderr, "got %zi bytes\n", ret);
/* now we should have some bytes in our buffer. /* now we should have some bytes in our buffer.
* Now skip the "\r\n" that may be left to do from self->read_bytes_till_header. * Now skip the "\r\n" that may be left to do from self->read_bytes_till_header.
@ -553,8 +549,6 @@ static ssize_t __enc_chunked_read(httpp_encoding_t *self, void *buf, size_t len,
* that is part of the header as well! * that is part of the header as well!
*/ */
fprintf(stderr, "current buffer layout: raw{offset=%zu, len=%zu}, decoded{offset=%zu, len=%zu}, read_bytes_till_header=%zu\n", self->buf_read_raw_offset, self->buf_read_raw_len, self->buf_read_decoded_offset, self->buf_read_decoded_len, self->read_bytes_till_header);
in_quote = 0; in_quote = 0;
offset_extentions = -1; offset_extentions = -1;
offset_CR = -1; offset_CR = -1;
@ -562,8 +556,6 @@ static ssize_t __enc_chunked_read(httpp_encoding_t *self, void *buf, size_t len,
for (i = self->buf_read_raw_offset, c = self->buf_read_raw + self->buf_read_raw_offset; for (i = self->buf_read_raw_offset, c = self->buf_read_raw + self->buf_read_raw_offset;
i < self->buf_read_raw_len; i < self->buf_read_raw_len;
i++, c++) { i++, c++) {
if (i < (self->buf_read_raw_offset + 80))
fprintf(stderr, "*c=0x%.2x'%c' in_quote=%i\n", (unsigned int)(unsigned char)*c, *c, in_quote);
if (in_quote) { if (in_quote) {
if (*c == '\\') in_quote = 2; if (*c == '\\') in_quote = 2;
else if (*c == '"') in_quote--; else if (*c == '"') in_quote--;
@ -580,7 +572,6 @@ static ssize_t __enc_chunked_read(httpp_encoding_t *self, void *buf, size_t len,
break; break;
} }
} }
fprintf(stderr, "current buffer layout: raw{offset=%zu, len=%zu}, decoded{offset=%zu, len=%zu}, read_bytes_till_header=%zu\n", self->buf_read_raw_offset, self->buf_read_raw_len, self->buf_read_decoded_offset, self->buf_read_decoded_len, self->read_bytes_till_header);
/* ok, now we know a lot more!: /* ok, now we know a lot more!:
* offset_extentions is the offset to the extentions if any. * offset_extentions is the offset to the extentions if any.
@ -592,13 +583,6 @@ static ssize_t __enc_chunked_read(httpp_encoding_t *self, void *buf, size_t len,
if (offset_LF == -1) if (offset_LF == -1)
return 0; return 0;
fprintf(stderr, "We got a header, body is at +%zi bytes\n", offset_LF + 1);
fflush(stderr);
if (offset_LF > 1024)
abort();
/* ok. Now we have a complet header. /* ok. Now we have a complet header.
* First pass the extentions to extention parser if any. * First pass the extentions to extention parser if any.
*/ */
@ -620,8 +604,6 @@ static ssize_t __enc_chunked_read(httpp_encoding_t *self, void *buf, size_t len,
if (sscanf(self->buf_read_raw + self->buf_read_raw_offset, "%llx", &bodylen) != 1) if (sscanf(self->buf_read_raw + self->buf_read_raw_offset, "%llx", &bodylen) != 1)
return -1; return -1;
fprintf(stderr, "bodylen=%llu\n", bodylen);
/* ok, Now we move the offset forward to the body. */ /* ok, Now we move the offset forward to the body. */
self->buf_read_raw_offset = offset_LF + 1; self->buf_read_raw_offset = offset_LF + 1;
@ -643,7 +625,6 @@ static ssize_t __enc_chunked_read(httpp_encoding_t *self, void *buf, size_t len,
/* ok, now we check if what we have in the buffer is less or equal than our bodylen. */ /* ok, now we check if what we have in the buffer is less or equal than our bodylen. */
if ((self->buf_read_raw_len - self->buf_read_raw_offset) <= bodylen) { if ((self->buf_read_raw_len - self->buf_read_raw_offset) <= bodylen) {
/* ok, this is fantastic. The framework can do the rest for us! */ /* ok, this is fantastic. The framework can do the rest for us! */
fprintf(stderr, "nice case: we have a data only buffer!\n");
self->buf_read_decoded = self->buf_read_raw; self->buf_read_decoded = self->buf_read_raw;
self->buf_read_decoded_offset = self->buf_read_raw_offset; self->buf_read_decoded_offset = self->buf_read_raw_offset;
self->buf_read_decoded_len = self->buf_read_raw_len; self->buf_read_decoded_len = self->buf_read_raw_len;
@ -651,7 +632,6 @@ static ssize_t __enc_chunked_read(httpp_encoding_t *self, void *buf, size_t len,
self->buf_read_raw_offset = 0; self->buf_read_raw_offset = 0;
self->buf_read_raw_len = 0; self->buf_read_raw_len = 0;
self->read_bytes_till_header = bodylen + 2 - (self->buf_read_decoded_len - self->buf_read_decoded_offset); self->read_bytes_till_header = bodylen + 2 - (self->buf_read_decoded_len - self->buf_read_decoded_offset);
fprintf(stderr, "final buffer layout: raw{offset=%zu, len=%zu}, decoded{offset=%zu, len=%zu}, read_bytes_till_header=%zu\n", self->buf_read_raw_offset, self->buf_read_raw_len, self->buf_read_decoded_offset, self->buf_read_decoded_len, self->read_bytes_till_header);
return 0; return 0;
} }
@ -661,8 +641,6 @@ static ssize_t __enc_chunked_read(httpp_encoding_t *self, void *buf, size_t len,
* and let our internal structures point to the next header. * and let our internal structures point to the next header.
*/ */
fprintf(stderr, "bad case: we need to allocate a new buffer!\n");
self->buf_read_decoded = malloc(bodylen); self->buf_read_decoded = malloc(bodylen);
if (!self->buf_read_decoded) /* just retry later if we can not allocate a buffer */ if (!self->buf_read_decoded) /* just retry later if we can not allocate a buffer */
return -1; return -1;
@ -672,8 +650,6 @@ static ssize_t __enc_chunked_read(httpp_encoding_t *self, void *buf, size_t len,
self->buf_read_raw_offset += bodylen; self->buf_read_raw_offset += bodylen;
self->read_bytes_till_header = 2; /* tailing "\r\n" */ self->read_bytes_till_header = 2; /* tailing "\r\n" */
fprintf(stderr, "final buffer layout: raw{offset=%zu, len=%zu}, decoded{offset=%zu, len=%zu}, read_bytes_till_header=%zu\n", self->buf_read_raw_offset, self->buf_read_raw_len, self->buf_read_decoded_offset, self->buf_read_decoded_len, self->read_bytes_till_header);
return 0; return 0;
} }