Merge remote branch 'origin/develop' into feature/check_examples

This commit is contained in:
Craig E. Despeaux 2014-01-10 10:17:55 -05:00
commit f15e147982
3 changed files with 13 additions and 8 deletions

View File

@ -370,8 +370,8 @@ getdns_dict_set_dict(struct getdns_dict * dict, char *name,
struct getdns_dict *newdict;
getdns_return_t retval;
if (!dict || !name)
return GETDNS_RETURN_NO_SUCH_DICT_NAME;
if (!dict || !name || !child_dict)
return GETDNS_RETURN_INVALID_PARAMETER;
retval = getdns_dict_copy(child_dict, &newdict);
if (retval != GETDNS_RETURN_GOOD)

View File

@ -74,6 +74,8 @@ struct event_base;
#define GETDNS_RETURN_DNSSEC_WITH_STUB_DISALLOWED_TEXT "A query was made with a context that is using stub resolution and a DNSSEC extension specified."
#define GETDNS_RETURN_MEMORY_ERROR 310
#define GETDNS_RETURN_MEMORY_ERROR_TEXT "Unable to allocate the memory required."
#define GETDNS_RETURN_INVALID_PARAMETER 311
#define GETDNS_RETURN_INVALID_PARAMETER_TEXT "A required parameter had an invalid value."
/** @}
*/

View File

@ -63,6 +63,9 @@ getdns_lookup_table getdns_error_str[] = {
,
{GETDNS_RETURN_MEMORY_ERROR,
"Unable to allocate the memory required."}
,
{GETDNS_RETURN_INVALID_PARAMETER,
GETDNS_RETURN_INVALID_PARAMETER_TEXT }
,
{0, ""}
};