ngx_strn2cmp() > ngx_memn2cmp()

diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index 2b239605200fe57a9369f82aaf3f0869a511830f..e12edbd74694a0f5432432ac544edd9a8b497954 100644 (file)
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -487,7 +487,7 @@ ngx_rstrncasecmp(u_char *s1, u_char *s2, size_t n)
 
 
 ngx_int_t
-ngx_strn2cmp(u_char *s1, u_char *s2, size_t n1, size_t n2)
+ngx_memn2cmp(u_char *s1, u_char *s2, size_t n1, size_t n2)
 {
     size_t     n;
     ngx_int_t  m, z;
@@ -501,7 +501,7 @@ ngx_strn2cmp(u_char *s1, u_char *s2, size_t n1, size_t n2)
         z = 1;
     }
 
-    m = ngx_strncmp(s1, s2, n);
+    m = ngx_memcmp(s1, s2, n);
 
     if (m || n1 == n2) {
         return m;

diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h
index 1dd8b549ff97c5e71ae37c148a46a5081bac1430..670063915f7b925a7f092f0d1f138d041bfdf593 100644 (file)
--- a/src/core/ngx_string.h
+++ b/src/core/ngx_string.h
@@ -130,7 +130,7 @@ u_char *ngx_vsnprintf(u_char *buf, size_t max, const char *fmt, va_list args);
 
 ngx_int_t ngx_rstrncmp(u_char *s1, u_char *s2, size_t n);
 ngx_int_t ngx_rstrncasecmp(u_char *s1, u_char *s2, size_t n);
-ngx_int_t ngx_strn2cmp(u_char *s1, u_char *s2, size_t n1, size_t n2);
+ngx_int_t ngx_memn2cmp(u_char *s1, u_char *s2, size_t n1, size_t n2);
 
 ngx_int_t ngx_atoi(u_char *line, size_t n);
 ssize_t ngx_atosz(u_char *line, size_t n);

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 5eecb7ae8b57517d80df916360292cdd5f1221f0..71d014ff00203deb6d97eed850e8c9601e611655 100644 (file)
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1436,7 +1436,7 @@ ngx_ssl_get_cached_session(ngx_ssl_conn_t *ssl_conn, u_char *id, int len,
         do {
             sess_id = (ngx_ssl_sess_id_t *) node;
 
-            rc = ngx_strn2cmp(id, sess_id->id,
+            rc = ngx_memn2cmp(id, sess_id->id,
                               (size_t) len, (size_t) node->data);
             if (rc == 0) {
 
@@ -1533,7 +1533,7 @@ ngx_ssl_remove_session(SSL_CTX *ssl, ngx_ssl_session_t *sess)
         do {
             sess_id = (ngx_ssl_sess_id_t *) node;
 
-            rc = ngx_strn2cmp(id, sess_id->id, len, (size_t) node->data);
+            rc = ngx_memn2cmp(id, sess_id->id, len, (size_t) node->data);
 
             if (rc == 0) {
                 sess_id->next->prev = sess_id->prev;
@@ -1632,7 +1632,7 @@ ngx_ssl_session_rbtree_insert_value(ngx_rbtree_node_t *temp,
             sess_id = (ngx_ssl_sess_id_t *) node;
             sess_id_temp = (ngx_ssl_sess_id_t *) temp;
 
-            if (ngx_strn2cmp(sess_id->id, sess_id_temp->id,
+            if (ngx_memn2cmp(sess_id->id, sess_id_temp->id,
                              (size_t) node->data, (size_t) temp->data)
                 < 0)
             {

diff --git a/src/http/modules/ngx_http_limit_zone_module.c b/src/http/modules/ngx_http_limit_zone_module.c
index fb4b6dafb350dfa3af090d0e498535828f6e8533..416a4ebf4be242be3218d926eef31108e2f5a79f 100644 (file)
--- a/src/http/modules/ngx_http_limit_zone_module.c
+++ b/src/http/modules/ngx_http_limit_zone_module.c
@@ -179,7 +179,7 @@ ngx_http_limit_zone_handler(ngx_http_request_t *r)
         do {
             lz = (ngx_http_limit_zone_node_t *) &node->color;
 
-            rc = ngx_strn2cmp(lz->data, vv->data, (size_t) lz->len, len);
+            rc = ngx_memn2cmp(lz->data, vv->data, (size_t) lz->len, len);
 
             if (rc == 0) {
                 if ((ngx_uint_t) lz->conn < lzcf->conn) {
@@ -266,7 +266,7 @@ ngx_http_limit_zone_rbtree_insert_value(ngx_rbtree_node_t *temp,
             lzn = (ngx_http_limit_zone_node_t *) &node->color;
             lznt = (ngx_http_limit_zone_node_t *) &temp->color;
 
-            if (ngx_strn2cmp(lzn->data, lznt->data, lzn->len, lznt->len) < 0) {
+            if (ngx_memn2cmp(lzn->data, lznt->data, lzn->len, lznt->len) < 0) {
 
                 if (temp->left == sentinel) {
                     temp->left = node;