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

Cleanup: Simplify client_complete

Browse Source 
Instead of using a "have" variable which makes it a bit confusing
to understand whats going on, use a do {} while (0) and break from it
instead.
This commit is contained in:
Marvin Scholz 2020-04-19 03:43:27 +02:00
parent 4b2d38fcfc
commit 0c3da2df86
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/client.c
View File

@ -124,50 +124,41 @@ void client_complete(client_t *client)
{ {
const char *header; const char *header;
long long unsigned int scannumber; long long unsigned int scannumber;
int have = 0;
if (!have) { do {
header = httpp_getvar(client->parser, "content-length"); header = httpp_getvar(client->parser, "content-length");
if (header) { if (header) {
if (sscanf(header, "%llu", &scannumber) == 1) { if (sscanf(header, "%llu", &scannumber) == 1) {
client->request_body_length = scannumber; client->request_body_length = scannumber;
have = 1; break;
}
} }
} }
if (!have) {
if (client->parser->req_type == httpp_req_source) { if (client->parser->req_type == httpp_req_source) {
client->request_body_length = -1; /* streaming */ client->request_body_length = -1; /* streaming */
have = 1; break;
}
} }
if (!have) {
header = httpp_getvar(client->parser, "transfer-encoding"); header = httpp_getvar(client->parser, "transfer-encoding");
if (header) { if (header) {
if (strcasecmp(header, "identity") != 0) { if (strcasecmp(header, "identity") != 0) {
client->request_body_length = -1; /* streaming */ client->request_body_length = -1; /* streaming */
have = 1; break;
}
} }
} }
if (!have) {
if (client->parser->req_type == httpp_req_put) { if (client->parser->req_type == httpp_req_put) {
/* As we don't know yet, we asume this PUT is in streaming mode */ /* As we don't know yet, we asume this PUT is in streaming mode */
client->request_body_length = -1; /* streaming */ client->request_body_length = -1; /* streaming */
have = 1; break;
}
} }
if (!have) {
if (client->parser->req_type == httpp_req_none) { if (client->parser->req_type == httpp_req_none) {
/* We are a client. If the server did not tell us, we asume streaming. */ /* We are a client. If the server did not tell us, we asume streaming. */
client->request_body_length = -1; /* streaming */ client->request_body_length = -1; /* streaming */
have = 1; break;
}
} }
} while (0);
ICECAST_LOG_DEBUG("Client %p has request_body_length=%zi", client, client->request_body_length); ICECAST_LOG_DEBUG("Client %p has request_body_length=%zi", client, client->request_body_length);
} }