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

This commit is contained in:
Craig E. Despeaux 2014-01-10 10:29:14 -05:00
commit 6a1b48052b
1 changed files with 8 additions and 3 deletions

View File

@ -329,13 +329,18 @@ getdns_general(struct getdns_context *context,
{ {
int extcheck = GETDNS_RETURN_GOOD; int extcheck = GETDNS_RETURN_GOOD;
if (!context || !context->event_base_async || callback == NULL) { if (!context || !context->event_base_async) {
/* Can't do async without an event loop /* Can't do async without an event loop
* or callback * or callback
*/ */
return GETDNS_RETURN_BAD_CONTEXT; return GETDNS_RETURN_BAD_CONTEXT;
} }
/* ensure callback is not NULL */
if (!callback) {
return GETDNS_RETURN_INVALID_PARAMETER;
}
extcheck = validate_extensions(extensions); extcheck = validate_extensions(extensions);
if (extcheck != GETDNS_RETURN_GOOD) if (extcheck != GETDNS_RETURN_GOOD)
return extcheck; return extcheck;