hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Run astyle on httpd.c and maxinfo_exec.c

Browse Source
This commit is contained in:
ekorh475
2016-11-18 10:54:14 +02:00
parent ecb6680e71
commit 5198c3e456
2 changed files with 420 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server/modules/protocol/httpd.c
View File

@ -39,9 +39,9 @@
#include <log_manager.h> #include <log_manager.h>
#include <resultset.h> #include <resultset.h>
/* @see function load_module in load_utils.c for explanation of the following /* @see function load_module in load_utils.c for explanation of the following
* lint directives. * lint directives.
*/ */
/*lint -e14 */ /*lint -e14 */
MODULE_INFO info = MODULE_INFO info =
{ {
@ -145,9 +145,9 @@ static int httpd_read_event(DCB* dcb)
SESSION *session = dcb->session; SESSION *session = dcb->session;
int numchars = 1; int numchars = 1;
char buf[HTTPD_REQUESTLINE_MAXLEN-1] = ""; char buf[HTTPD_REQUESTLINE_MAXLEN - 1] = "";
char *query_string = NULL; char *query_string = NULL;
char method[HTTPD_METHOD_MAXLEN-1] = ""; char method[HTTPD_METHOD_MAXLEN - 1] = "";
char url[HTTPD_SMALL_BUFFER] = ""; char url[HTTPD_SMALL_BUFFER] = "";
size_t i, j; size_t i, j;
int headers_read = 0; int headers_read = 0;
@ -163,11 +163,13 @@ static int httpd_read_event(DCB* dcb)
numchars = httpd_get_line(dcb->fd, buf, sizeof(buf)); numchars = httpd_get_line(dcb->fd, buf, sizeof(buf));
i = 0; j = 0; i = 0;
j = 0;
while (!ISspace(buf[j]) && (i < sizeof(method) - 1)) while (!ISspace(buf[j]) && (i < sizeof(method) - 1))
{ {
method[i] = buf[j]; method[i] = buf[j];
i++; j++; i++;
j++;
} }
method[i] = '\0'; method[i] = '\0';
@ -190,7 +192,8 @@ static int httpd_read_event(DCB* dcb)
while ((j < sizeof(buf) - 1) && !ISspace(buf[j]) && (i < sizeof(url) - 1)) while ((j < sizeof(buf) - 1) && !ISspace(buf[j]) && (i < sizeof(url) - 1))
{ {
url[i] = buf[j]; url[i] = buf[j];
i++; j++; i++;
j++;
} }
url[i] = '\0'; url[i] = '\0';
@ -225,7 +228,7 @@ static int httpd_read_event(DCB* dcb)
{ {
*value = '\0'; *value = '\0';
value++; value++;
end = &value[strlen(value) -1]; end = &value[strlen(value) - 1];
*end = '\0'; *end = '\0';
if (strncasecmp(buf, "Hostname", 6) == 0) if (strncasecmp(buf, "Hostname", 6) == 0)

753
server/modules/routing/maxinfo/maxinfo_exec.c
View File

File diff suppressed because it is too large Load Diff