generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add debug messages for initialization failures

Browse Source
This commit is contained in:
Yang Tse 2007-02-02 16:01:55 +00:00
parent 8260243be1
commit 8337a375dd
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ares/ares_init.c
View File

@ -91,7 +91,8 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
int optmask) int optmask)
{ {
ares_channel channel; ares_channel channel;
int i, status; int i;
int status = ARES_SUCCESS;
struct server_state *server; struct server_state *server;
struct timeval tv; struct timeval tv;
@ -106,8 +107,10 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
#endif #endif
channel = malloc(sizeof(struct ares_channeldata)); channel = malloc(sizeof(struct ares_channeldata));
if (!channel) if (!channel) {
*channelptr = NULL;
return ARES_ENOMEM; return ARES_ENOMEM;
}
/* Set everything to distinguished values so we know they haven't /* Set everything to distinguished values so we know they haven't
* been set yet. * been set yet.
@ -132,13 +135,31 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
/* Initialize configuration by each of the four sources, from highest /* Initialize configuration by each of the four sources, from highest
* precedence to lowest. * precedence to lowest.
*/ */
if (status == ARES_SUCCESS) {
status = init_by_options(channel, options, optmask); status = init_by_options(channel, options, optmask);
if (status == ARES_SUCCESS) if (status != ARES_SUCCESS)
DEBUGF(fprintf(stderr, "Error: init_by_options failed: %s\n",
ares_strerror(status)));
}
if (status == ARES_SUCCESS) {
status = init_by_environment(channel); status = init_by_environment(channel);
if (status == ARES_SUCCESS) if (status != ARES_SUCCESS)
DEBUGF(fprintf(stderr, "Error: init_by_environment failed: %s\n",
ares_strerror(status)));
}
if (status == ARES_SUCCESS) {
status = init_by_resolv_conf(channel); status = init_by_resolv_conf(channel);
if (status == ARES_SUCCESS) if (status != ARES_SUCCESS)
DEBUGF(fprintf(stderr, "Error: init_by_resolv_conf failed: %s\n",
ares_strerror(status)));
}
if (status == ARES_SUCCESS) {
status = init_by_defaults(channel); status = init_by_defaults(channel);
if (status != ARES_SUCCESS)
DEBUGF(fprintf(stderr, "Error: init_by_defaults failed: %s\n",
ares_strerror(status)));
}
if (status != ARES_SUCCESS) if (status != ARES_SUCCESS)
{ {
/* Something failed; clean up memory we may have allocated. */ /* Something failed; clean up memory we may have allocated. */