# HG changeset patch # User Evan Schoenberg # Date 1172439719 0 # Node ID d253c87a6a1f6d375afed30b0346f05295aeeb28 # Parent fe5398f498ee9da5ce6225adac035ae7f85bf3a3 Remove a g_return_val_if_fail() which isn't needed, made gaim_dnsquery_get_port() return an unsigned short and return 0 if query_data is NULL, and fixed a whitespace mistake diff -r fe5398f498ee -r d253c87a6a1f libpurple/dnsquery.c --- a/libpurple/dnsquery.c Sun Feb 25 19:19:12 2007 +0000 +++ b/libpurple/dnsquery.c Sun Feb 25 21:41:59 2007 +0000 @@ -477,7 +477,7 @@ handle_next_queued_request(); return; } - + /* * If we have any children, attempt to have them perform the DNS * query. If we're able to send the query then resolver will be @@ -935,10 +935,10 @@ return query_data->hostname; } -int +unsigned short gaim_dnsquery_get_port(GaimDnsQueryData *query_data) { - g_return_val_if_fail(query_data != NULL, -1); + g_return_val_if_fail(query_data != NULL, 0); return query_data->port; } @@ -952,8 +952,9 @@ GaimDnsQueryUiOps * gaim_dnsquery_get_ui_ops(void) { - g_return_val_if_fail(dns_query_ui_ops != NULL, NULL); - + /* It is perfectly acceptable for dns_query_ui_ops to be NULL; this just + * means that the default platform-specific implementation will be used. + */ return dns_query_ui_ops; } diff -r fe5398f498ee -r d253c87a6a1f libpurple/dnsquery.h --- a/libpurple/dnsquery.h Sun Feb 25 19:19:12 2007 +0000 +++ b/libpurple/dnsquery.h Sun Feb 25 21:41:59 2007 +0000 @@ -121,7 +121,7 @@ * @param query_data The DNS query * @return The port. */ -int gaim_dnsquery_get_port(GaimDnsQueryData *query_data); +unsigned short gaim_dnsquery_get_port(GaimDnsQueryData *query_data); /** * Initializes the DNS query subsystem.