mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 01:12:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ngx_strn2cmp() > ngx_memn2cmp()

Browse Source
This commit is contained in:
Igor Sysoev 2007-01-12 21:58:02 +00:00
parent a1e82cca22
commit ec3cabdcd9
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/ngx_string.c
View File

@ -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;

2
src/core/ngx_string.h
View File

@ -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);

6
src/event/ngx_event_openssl.c
View File

@ -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)
{

4
src/http/modules/ngx_http_limit_zone_module.c
View File

@ -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;