nxt_str_t changes.

This commit is contained in:
Igor Sysoev
2017-02-01 19:20:07 +03:00
parent 8942550b13
commit 6e67bee0f4
15 changed files with 358 additions and 355 deletions

View File

@@ -10,7 +10,7 @@
static nxt_int_t
nxt_lvlhsh_unit_test_key_test(nxt_lvlhsh_query_t *lhq, void *data)
{
if (*(uintptr_t *) lhq->key.data == (uintptr_t) data) {
if (*(uintptr_t *) lhq->key.start == (uintptr_t) data) {
return NXT_OK;
}
@@ -58,8 +58,8 @@ nxt_lvlhsh_unit_test_add(nxt_lvlhsh_t *lh, const nxt_lvlhsh_proto_t *proto,
lhq.key_hash = key;
lhq.replace = 0;
lhq.key.len = sizeof(uintptr_t);
lhq.key.data = (u_char *) &key;
lhq.key.length = sizeof(uintptr_t);
lhq.key.start = (u_char *) &key;
lhq.value = (void *) key;
lhq.proto = proto;
lhq.pool = pool;
@@ -85,8 +85,8 @@ nxt_lvlhsh_unit_test_get(nxt_lvlhsh_t *lh, const nxt_lvlhsh_proto_t *proto,
nxt_lvlhsh_query_t lhq;
lhq.key_hash = key;
lhq.key.len = sizeof(uintptr_t);
lhq.key.data = (u_char *) &key;
lhq.key.length = sizeof(uintptr_t);
lhq.key.start = (u_char *) &key;
lhq.proto = proto;
if (nxt_lvlhsh_find(lh, &lhq) == NXT_OK) {
@@ -111,8 +111,8 @@ nxt_lvlhsh_unit_test_delete(nxt_lvlhsh_t *lh, const nxt_lvlhsh_proto_t *proto,
nxt_lvlhsh_query_t lhq;
lhq.key_hash = key;
lhq.key.len = sizeof(uintptr_t);
lhq.key.data = (u_char *) &key;
lhq.key.length = sizeof(uintptr_t);
lhq.key.start = (u_char *) &key;
lhq.proto = proto;
lhq.pool = pool;

View File

@@ -44,7 +44,7 @@ nxt_term_parse_unit_test(nxt_thread_t *thr)
for (i = 0; i < nxt_nitems(terms); i++) {
s = &terms[i].string;
val = nxt_term_parse(s->data, s->len, terms[i].is_sec);
val = nxt_term_parse(s->start, s->length, terms[i].is_sec);
if (val != terms[i].value) {
nxt_log_alert(thr->log,