From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Tue, 2 Oct 2018 17:33:14 +0000 (+0300)
Subject: Added nxt_memset().
X-Git-Tag: 0.2.5~17
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=cdc15c2aa575ecb258362c7a404fd56e83ee12d0;p=njs.git

Added nxt_memset().
---

diff --git a/njs/njs_json.c b/njs/njs_json.c
index 276ff438..bdd6b3b0 100644
--- a/njs/njs_json.c
+++ b/njs/njs_json.c
@@ -2316,7 +2316,7 @@ njs_vm_value_dump(njs_vm_t *vm, nxt_str_t *retval, const njs_value_t *value,
         goto memory_error;
     }
 
-    memset(stringify->space.start, ' ', indent);
+    nxt_memset(stringify->space.start, ' ', indent);
 
     if (nxt_array_init(&stringify->stack, NULL, 4, sizeof(njs_json_state_t),
                        &njs_array_mem_proto, vm->mem_cache_pool)
diff --git a/njs/njs_string.c b/njs/njs_string.c
index 938b7512..ef8abbe9 100644
--- a/njs/njs_string.c
+++ b/njs/njs_string.c
@@ -2477,10 +2477,10 @@ njs_string_prototype_pad(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
     memcpy(start, string.start, string.size);
 
     if (nargs == 2) {
-        memset(p, ' ', padding);
+        nxt_memset(p, ' ', padding);
 
     } else if (pad_string.size == 1) {
-        memset(p, pad_string.start[0], padding);
+        nxt_memset(p, pad_string.start[0], padding);
 
     } else {
         while (n != 0) {
diff --git a/nxt/nxt_dtoa.c b/nxt/nxt_dtoa.c
index 20ea2ebe..e9f1f331 100644
--- a/nxt/nxt_dtoa.c
+++ b/nxt/nxt_dtoa.c
@@ -280,7 +280,7 @@ nxt_prettify(char *start, size_t len, int dec_exp)
         /* 1234e7 -> 12340000000 */
 
         if (kk - length > 0) {
-            memset(&start[length], '0', kk - length);
+            nxt_memset(&start[length], '0', kk - length);
         }
 
         return kk;
@@ -305,7 +305,7 @@ nxt_prettify(char *start, size_t len, int dec_exp)
         start[1] = '.';
 
         if (offset - 2 > 0) {
-            memset(&start[2], '0', offset - 2);
+            nxt_memset(&start[2], '0', offset - 2);
         }
 
         return (length + offset);
diff --git a/nxt/nxt_mem_cache_pool.c b/nxt/nxt_mem_cache_pool.c
index c8757ad7..7b293cd6 100644
--- a/nxt/nxt_mem_cache_pool.c
+++ b/nxt/nxt_mem_cache_pool.c
@@ -131,7 +131,7 @@ struct nxt_mem_cache_pool_s {
 
 
 #define nxt_mem_cache_free_junk(p, size)                                      \
-    memset((p), 0x5A, size)
+    nxt_memset((p), 0x5A, size)
 
 
 #define nxt_is_power_of_two(value)                                            \
diff --git a/nxt/nxt_string.h b/nxt/nxt_string.h
index f3b1b147..e48ec9a1 100644
--- a/nxt/nxt_string.h
+++ b/nxt/nxt_string.h
@@ -44,6 +44,9 @@ nxt_upper_case(u_char c)
 #define nxt_cpymem(dst, src, n)   (((u_char *) memcpy(dst, src, n)) + (n))
 
 
+#define nxt_memset(buf, c, length)   (void) (memset(buf, c, length))
+
+
 #define nxt_memzero(buf, length)   (void) (memset(buf, 0, length))
 
 
diff --git a/nxt/test/rbtree_unit_test.c b/nxt/test/rbtree_unit_test.c
index c1347bfb..44bce0b1 100644
--- a/nxt/test/rbtree_unit_test.c
+++ b/nxt/test/rbtree_unit_test.c
@@ -8,6 +8,7 @@
 #include <nxt_types.h>
 #include <nxt_clang.h>
 #include <nxt_stub.h>
+#include <nxt_string.h>
 #include <nxt_rbtree.h>
 #include <nxt_murmur_hash.h>
 #include <stdio.h>
@@ -102,7 +103,7 @@ rbtree_unit_test(nxt_uint_t n)
 
     for (i = 0; i < n; i++) {
         nxt_rbtree_delete(&tree, &items[i].node);
-        memset(&items[i], 0xA5, sizeof(nxt_rbtree_test_t));
+        nxt_memset(&items[i], 0xA5, sizeof(nxt_rbtree_test_t));
     }
 
     if (!nxt_rbtree_is_empty(&tree)) {