Imported Upstream version 7.53.1

[platform/upstream/curl.git] / tests / unit / unit1305.c

diff --git a/tests/unit/unit1305.c b/tests/unit/unit1305.c
index 91e3b0b..db0a44c 100644 (file)
--- a/tests/unit/unit1305.c
+++ b/tests/unit/unit1305.c
@@ -5,11 +5,11 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
  *
  * You may opt to use, copy, modify, merge, publish, distribute and/or sell
  * copies of the Software, and permit persons to whom the Software is
@@ -39,19 +39,20 @@
 
 #include "memdebug.h" /* LAST include file */
 
-static struct SessionHandle *data;
-static struct curl_hash *hp;
+static struct Curl_easy *data;
+static struct curl_hash hp;
 static char *data_key;
 static struct Curl_dns_entry *data_node;
 
-static CURLcode unit_setup( void )
+static CURLcode unit_setup(void)
 {
+  int rc;
   data = curl_easy_init();
-  if (!data)
+  if(!data)
     return CURLE_OUT_OF_MEMORY;
 
-  hp = Curl_mk_dnscache();
-  if(!hp) {
+  rc = Curl_mk_dnscache(&hp);
+  if(rc) {
     curl_easy_cleanup(data);
     curl_global_cleanup();
     return CURLE_OUT_OF_MEMORY;
@@ -59,16 +60,14 @@ static CURLcode unit_setup( void )
   return CURLE_OK;
 }
 
-static void unit_stop( void )
+static void unit_stop(void)
 {
-  if (data_node) {
+  if(data_node) {
     Curl_freeaddrinfo(data_node->addr);
     free(data_node);
   }
-  if (data_key)
-    free(data_key);
-
-  Curl_hash_destroy(hp);
+  free(data_key);
+  Curl_hash_destroy(&hp);
 
   curl_easy_cleanup(data);
   curl_global_cleanup();
@@ -79,17 +78,20 @@ static Curl_addrinfo *fake_ai(void)
   static Curl_addrinfo *ai;
   int ss_size;
 
-  ss_size = sizeof (struct sockaddr_in);
+  ss_size = sizeof(struct sockaddr_in);
 
-  if((ai = calloc(1, sizeof(Curl_addrinfo))) == NULL)
+  ai = calloc(1, sizeof(Curl_addrinfo));
+  if(!ai)
     return NULL;
 
-  if((ai->ai_canonname = strdup("dummy")) == NULL) {
+  ai->ai_canonname = strdup("dummy");
+  if(!ai->ai_canonname) {
     free(ai);
     return NULL;
   }
 
-  if((ai->ai_addr = calloc(1, ss_size)) == NULL) {
+  ai->ai_addr = calloc(1, ss_size);
+  if(!ai->ai_addr) {
     free(ai->ai_canonname);
     free(ai);
     return NULL;
@@ -104,15 +106,15 @@ static Curl_addrinfo *fake_ai(void)
 static CURLcode create_node(void)
 {
   data_key = aprintf("%s:%d", "dummy", 0);
-  if (!data_key)
+  if(!data_key)
     return CURLE_OUT_OF_MEMORY;
 
   data_node = calloc(1, sizeof(struct Curl_dns_entry));
-  if (!data_node)
+  if(!data_node)
     return CURLE_OUT_OF_MEMORY;
 
   data_node->addr = fake_ai();
-  if (!data_node->addr)
+  if(!data_node->addr)
     return CURLE_OUT_OF_MEMORY;
 
   return CURLE_OK;
@@ -125,17 +127,16 @@ UNITTEST_START
   size_t key_len;
 
   /* Test 1305 exits without adding anything to the hash */
-  if (strcmp(arg, "1305") != 0) {
+  if(strcmp(arg, "1305") != 0) {
     CURLcode rc = create_node();
     abort_unless(rc == CURLE_OK, "data node creation failed");
     key_len = strlen(data_key);
 
-    nodep = Curl_hash_add(hp, data_key, key_len+1, data_node);
+    data_node->inuse = 1; /* hash will hold the reference */
+    nodep = Curl_hash_add(&hp, data_key, key_len+1, data_node);
     abort_unless(nodep, "insertion into hash failed");
     /* Freeing will now be done by Curl_hash_destroy */
     data_node = NULL;
-
-    /* To do: test retrieval, deletion, edge conditions */
   }
 
 UNITTEST_STOP