mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-09 16:21:45 +00:00
Fix unit test
This commit is contained in:
1 parent
29454e2296
commit
14d6f71f82
3 files changed
+27
-33
No files matched your search
+11
-16
@@ -5016,20 +5016,16 @@ struct mg_connection *mg_next(struct mg_server *s, struct mg_connection *c) {
|
||||
|
||||
static int get_var(const char *data, size_t data_len, const char *name,
|
||||
char *dst, size_t dst_len, int n) {
|
||||
const char *p, *e, *s;
|
||||
const char *p, *e = data + data_len, *s;
|
||||
size_t name_len;
|
||||
int i, len;
|
||||
int i = 0, len = -1;
|
||||
|
||||
if (dst == NULL || dst_len == 0) {
|
||||
len = -2;
|
||||
} else if (data == NULL || name == NULL || data_len == 0) {
|
||||
len = -1;
|
||||
dst[0] = '\0';
|
||||
} else {
|
||||
i = 0;
|
||||
name_len = strlen(name);
|
||||
e = data + data_len;
|
||||
len = -1;
|
||||
dst[0] = '\0';
|
||||
|
||||
// data is "var1=val1&var2=val2...". Find variable first
|
||||
@@ -5037,8 +5033,7 @@ static int get_var(const char *data, size_t data_len, const char *name,
|
||||
if ((p == data || p[-1] == '&') && p[name_len] == '=' &&
|
||||
!mg_strncasecmp(name, p, name_len)) {
|
||||
|
||||
if(n != i++)
|
||||
continue;
|
||||
if (n != i++) continue;
|
||||
|
||||
// Point p to variable value
|
||||
p += name_len + 1;
|
||||
@@ -5065,21 +5060,21 @@ static int get_var(const char *data, size_t data_len, const char *name,
|
||||
return len;
|
||||
}
|
||||
|
||||
int mg_get_var(const struct mg_connection *conn, const char *name,
|
||||
char *dst, size_t dst_len) {
|
||||
return mg_get_n_var(conn, name, dst, dst_len, 0);
|
||||
}
|
||||
|
||||
int mg_get_n_var(const struct mg_connection *conn, const char *name,
|
||||
int mg_get_var_n(const struct mg_connection *conn, const char *name,
|
||||
char *dst, size_t dst_len, int n) {
|
||||
int len = get_var(conn->query_string, conn->query_string == NULL ? 0 :
|
||||
strlen(conn->query_string), name, dst, dst_len, n);
|
||||
if (len == -1) {
|
||||
len = get_var(conn->content, conn->content_len, name, dst, dst_len, n);;
|
||||
len = get_var(conn->content, conn->content_len, name, dst, dst_len, n);
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
int mg_get_var(const struct mg_connection *conn, const char *name,
|
||||
char *dst, size_t dst_len) {
|
||||
return mg_get_var_n(conn, name, dst, dst_len, 0);
|
||||
}
|
||||
|
||||
static int get_line_len(const char *buf, int buf_len) {
|
||||
int len = 0;
|
||||
while (len < buf_len && buf[len] != '\n') len++;
|
||||
@@ -5308,7 +5303,7 @@ static void send_ns_event(struct ns_connection *nc, int ev, void *p) {
|
||||
}
|
||||
#else
|
||||
static void send_ns_event(struct ns_connection *nc, int ev, void *p) {
|
||||
(void) nc; (void) p;
|
||||
(void) nc; (void) p; (void) ev;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in new issue
Block a user