Ignoring previous value in njs_flathsh_insert().

Previously, fhq->value was set to a previous value if the value existed.
This is not used anymore in the code.

diff --git a/src/njs_flathsh.c b/src/njs_flathsh.c
index a9ef6e699a50a1df8801029deb81a98833754e0a..5a4efaa51424cf369c8dee9e14454e5c01904313 100644 (file)
--- a/src/njs_flathsh.c
+++ b/src/njs_flathsh.c
@@ -376,7 +376,6 @@ njs_flathsh_unique_find(const njs_flathsh_t *fh, njs_flathsh_query_t *fhq)
 njs_int_t
 njs_flathsh_insert(njs_flathsh_t *fh, njs_flathsh_query_t *fhq)
 {
-    void                 *tmp;
     njs_int_t            cell_num, elt_num;
     njs_flathsh_elt_t    *elt, *elts;
     njs_flathsh_descr_t  *h;
@@ -403,15 +402,11 @@ njs_flathsh_insert(njs_flathsh_t *fh, njs_flathsh_query_t *fhq)
             fhq->proto->test(fhq, elt->value) == NJS_OK)
         {
             if (fhq->replace) {
-                tmp = fhq->value;
-                fhq->value = elt->value;
-                elt->value = tmp;
+                elt->value = fhq->value;
 
                 return NJS_OK;
 
             } else {
-                fhq->value = elt->value;
-
                 return NJS_DECLINED;
             }
         }

diff --git a/src/njs_flathsh.h b/src/njs_flathsh.h
index 985bdab1a9d96e288aeca608dbad0236bf04728c..e15162d64044ce137632c3c824326fe8474bb6e7 100644 (file)
--- a/src/njs_flathsh.h
+++ b/src/njs_flathsh.h
@@ -91,14 +91,13 @@ NJS_EXPORT njs_int_t njs_flathsh_unique_find(const njs_flathsh_t *fh,
     njs_flathsh_query_t *fhq);
 
 /*
- * njs_flathsh_insert() adds a hash element.  If the element is already
- * present in flathsh and the fhq->replace flag is zero, then fhq->value
- * is updated with the old element and NJS_DECLINED is returned.
- * If the element is already present in flathsh and the fhq->replace flag
- * is non-zero, then the old element is replaced with the new element.
- * fhq->value is updated with the old element, and NJS_OK is returned.
+ * njs_flathsh_insert() adds a hash element.  If the element is already present
+ * in flathsh and the fhq->replace flag is zero, then NJS_DECLINED is returned.
+ * If the element is already present in flathsh and the fhq->replace flag is
+ * non-zero, then the old element is replaced with the new element and NJS_OK is
+ * returned.
  * If the element is not present in flathsh, then it is inserted and
- * NJS_OK is returned.  The fhq->value is not changed.
+ * NJS_OK is returned.
  * On memory allocation failure NJS_ERROR is returned.
  *
  * The required njs_flathsh_query_t fields: key_hash, key, proto, replace,