Merge fixes

spec/example-all-functions.c

@@ -296,7 +296,7 @@ retregular = getdns_context_set_dnssec_allowed_skew(
   uint16arg
 );
 
-retregular = getdns_context_set_stub_resolution(
+retregular = getdns_context_set_upstream_recursive_servers(
   contextarg,
   listarg
 );

spec/getdns_core_only.c

@@ -409,7 +409,7 @@ getdns_context_set_dnssec_allowed_skew(
 { UNUSED_PARAM(context); UNUSED_PARAM(value); return GETDNS_RETURN_GOOD; }
 
 getdns_return_t
-getdns_context_set_stub_resolution(
+getdns_context_set_upstream_recursive_servers(
   struct getdns_context  *context,
   struct getdns_list     *upstream_list
 )

spec/getdns_core_only.h

@@ -1,4 +1,4 @@
-/* Created at 2014-01-14-15-35-55*/
+/* Created at 2014-01-20-16-01-49*/
 #ifndef GETDNS_H
 #define GETDNS_H
 
@@ -549,7 +549,7 @@ getdns_context_set_dnssec_allowed_skew(
 );
 
 getdns_return_t
-getdns_context_set_stub_resolution(
+getdns_context_set_upstream_recursive_servers(
   struct getdns_context  *context,
   struct getdns_list     *upstream_list
 );

spec/index.html

@@ -2088,7 +2088,7 @@ must do its own DNSSEC processing, possibly with the <code>getdns_validate_dnsse
 
 <div class=forh>
 getdns_return_t
-getdns_context_set_stub_resolution(
+getdns_context_set_upstream_recursive_servers(
   struct getdns_context  *context,
   struct getdns_list     *upstream_list
 );</div>
@@ -2210,7 +2210,7 @@ The response dicts inherit the custom memory management functions and the value
 
 <h1>9. The Generated Files</h1>
 
-<p>There is <a href="getdns-0.375.tgz">a tarball</a> that includes the .h files,
+<p>There is <a href="getdns-0.376.tgz">a tarball</a> that includes the .h files,
 the examples, and so on. The examples all make, even though there is no API implementation, based
 on a pseudo-implementation in the tarball; see make-examples-PLATFORM.sh. Note that this currently builds fine
 on the Macintosh and Ubuntu; help is definitely appreciated on making the build process

src/context.c

@@ -718,11 +718,11 @@ getdns_context_set_dnssec_allowed_skew(struct getdns_context *context,
 }				/* getdns_context_set_dnssec_allowed_skew */
 
 /*
- * getdns_context_set_stub_resolution
+ * getdns_context_set_upstream_recursive_servers
  *
  */
 getdns_return_t
-getdns_context_set_stub_resolution(struct getdns_context *context,
+getdns_context_set_upstream_recursive_servers(struct getdns_context *context,
     struct getdns_list * upstream_list)
 {
 	size_t count = 0;
@@ -761,7 +761,7 @@ getdns_context_set_stub_resolution(struct getdns_context *context,
 	    GETDNS_CONTEXT_CODE_UPSTREAM_RECURSIVE_SERVERS);
 
 	return GETDNS_RETURN_GOOD;
-}				/* getdns_context_set_stub_resolution */
+}			/* getdns_context_set_upstream_recursive_servers */
 
 /*
  * getdns_context_set_edns_maximum_udp_payload_size

src/dict.c

@@ -746,7 +746,7 @@ getdns_dict_remove_name(struct getdns_dict *this_dict, char *name)
     if (!this_dict || !name)
         return GETDNS_RETURN_INVALID_PARAMETER;
 
-    item = getdns_dict_find(this_dict, name, 0);
+    item = getdns_dict_find(this_dict, name);
     if (!item)
         return GETDNS_RETURN_NO_SUCH_DICT_NAME;
 

src/example/example-all-functions.c

@@ -296,7 +296,7 @@ retregular = getdns_context_set_dnssec_allowed_skew(
   uint16arg
 );
 
-retregular = getdns_context_set_stub_resolution(
+retregular = getdns_context_set_upstream_recursive_servers(
   contextarg,
   listarg
 );

src/example/example-reverse.c

@@ -57,7 +57,7 @@ void this_callbackfn(struct getdns_context *this_context,
 
 					struct getdns_bindata * this_dname;
 					this_ret = getdns_dict_get_bindata(this_rdata, "rdata_raw", &this_dname);
-					char *this_dname_str = getdns_convert_dns_name_to_fqdn((char *)this_dname->data);
+					char *this_dname_str = getdns_convert_dns_name_to_fqdn(this_dname->data);
 					printf("The dname is %s\n", this_dname_str);
 					free(this_dname_str);
 
@@ -96,7 +96,7 @@ int main()
 	/* Set up the getdns call */
 	struct getdns_dict * this_addr_to_look_up = getdns_dict_create();
 	// TODO: check the return value above
-	struct getdns_bindata this_type = { 5, (void *)"IPv4" };
+	struct getdns_bindata this_type = { 4, (void *)"IPv4" };
 	getdns_return_t this_ret = getdns_dict_set_bindata(this_addr_to_look_up, "address_type", &this_type);
 	UNUSED_PARAM(this_ret);
 	struct getdns_bindata this_ipv4_addr = { 4, (void *)"\x08\x08\x08\x08" };

src/getdns/getdns.h

@@ -846,7 +846,7 @@ getdns_context_set_dnssec_allowed_skew(struct getdns_context *context,
     uint16_t value);
 
 getdns_return_t
-getdns_context_set_stub_resolution(struct getdns_context *context,
+getdns_context_set_upstream_recursive_servers(struct getdns_context *context,
     struct getdns_list *upstream_list);
 
 getdns_return_t