Merged with the default branch.

7 files changed, 7 insertions, 7 deletions

diff --git a/src/test/nxt_http_parse_test.c b/src/test/nxt_http_parse_test.c
index 540309c1..5f1a518c 100644
--- a/src/test/nxt_http_parse_test.c
+++ b/src/test/nxt_http_parse_test.c
@@ -753,7 +753,7 @@ nxt_http_parse_test_request_line(nxt_http_request_parse_t *rp,
         return NXT_ERROR;
     }
 
-    if (nxt_memcmp(rp->version.str, test->version, 8) != 0) {
+    if (memcmp(rp->version.str, test->version, 8) != 0) {
         nxt_log_alert(log, "http parse test case failed:\n"
                            " - request:\n\"%V\"\n"
                            " - version: \"%*s\" (expected: \"%*s\")", request,
diff --git a/src/test/nxt_tests.c b/src/test/nxt_tests.c
index f5a1cbd4..03a2a1df 100644
--- a/src/test/nxt_tests.c
+++ b/src/test/nxt_tests.c
@@ -41,7 +41,7 @@ main(int argc, char **argv)
 #if (NXT_TEST_RTDTSC)
 
     if (nxt_process_argv[1] != NULL
-        && nxt_memcmp(nxt_process_argv[1], "rbm", 3) == 0)
+        && memcmp(nxt_process_argv[1], "rbm", 3) == 0)
     {
         if (nxt_rbtree1_mb_start(thr) != NXT_OK) {
             return 1;
diff --git a/src/test/nxt_unit_app_test.c b/src/test/nxt_unit_app_test.c
index 8fda9740..d83bd83a 100644
--- a/src/test/nxt_unit_app_test.c
+++ b/src/test/nxt_unit_app_test.c
@@ -225,7 +225,7 @@ greeting_app_request_handler(nxt_unit_request_info_t *req)
     *p++ = '\n';
 
     p = copy(p, LOCAL_ADDR, nxt_length(LOCAL_ADDR));
-    p = copy(p, nxt_unit_sptr_get(&r->local), r->local_length);
+    p = copy(p, nxt_unit_sptr_get(&r->local_addr), r->local_addr_length);
     *p++ = '\n';
 
     p = copy(p, TARGET, nxt_length(TARGET));
diff --git a/src/test/nxt_unit_websocket_chat.c b/src/test/nxt_unit_websocket_chat.c
index 39f8a440..ec7c2cc3 100644
--- a/src/test/nxt_unit_websocket_chat.c
+++ b/src/test/nxt_unit_websocket_chat.c
@@ -201,7 +201,7 @@ ws_chat_close_handler(nxt_unit_request_info_t *req)
 
 
 int
-main()
+main(void)
 {
     nxt_unit_ctx_t   *ctx;
     nxt_unit_init_t  init;
diff --git a/src/test/nxt_unit_websocket_echo.c b/src/test/nxt_unit_websocket_echo.c
index 2a89cdc0..eab2e45f 100644
--- a/src/test/nxt_unit_websocket_echo.c
+++ b/src/test/nxt_unit_websocket_echo.c
@@ -83,7 +83,7 @@ ws_echo_websocket_handler(nxt_unit_websocket_frame_t *ws)
 
 
 int
-main()
+main(void)
 {
     nxt_unit_ctx_t   *ctx;
     nxt_unit_init_t  init;
diff --git a/src/test/nxt_utf8_file_name_test.c b/src/test/nxt_utf8_file_name_test.c
index 30546ffb..5723e19b 100644
--- a/src/test/nxt_utf8_file_name_test.c
+++ b/src/test/nxt_utf8_file_name_test.c
@@ -129,7 +129,7 @@ nxt_utf8_file_name_test(nxt_thread_t *thr)
 
             nxt_file_close(&task, &lc_file);
 
-            if (n != 4 || nxt_memcmp(utf8, test, 4) != 0) {
+            if (n != 4 || memcmp(utf8, test, 4) != 0) {
                 nxt_log_alert(thr->log, "nxt_file_read() mismatch");
 
                 nxt_file_delete(lc_file.name);
diff --git a/src/test/nxt_utf8_test.c b/src/test/nxt_utf8_test.c
index bca9a737..31e5bff9 100644
--- a/src/test/nxt_utf8_test.c
+++ b/src/test/nxt_utf8_test.c
@@ -59,7 +59,7 @@ nxt_utf8_overlong(nxt_thread_t *thr, u_char *overlong, size_t len)
 
         size = (p != NULL) ? p - utf8 : 0;
 
-        if (len != size || nxt_memcmp(overlong, utf8, size) != 0) {
+        if (len != size || memcmp(overlong, utf8, size) != 0) {
 
             u = 0;
             for (i = 0; i < len; i++) {