Skip to content

Commit

Permalink
gweb: Do not compare expression against NULL
Browse files Browse the repository at this point in the history
This patch generate via coccinelle with:

@ disable is_null,isnt_null1 @
expression E;
@@

(
- E == NULL
+ !E
|
- E != NULL
+ E
)
  • Loading branch information
Daniel Wagner authored and pfl committed Aug 7, 2013
1 parent 555a166 commit 98cd55e
Show file tree
Hide file tree
Showing 3 changed files with 117 additions and 122 deletions.
2 changes: 1 addition & 1 deletion gweb/giognutls.c
Expand Up @@ -309,7 +309,7 @@ static gboolean g_io_gnutls_dispatch(GSource *source, GSourceFunc callback,

DBG("source %p condition %u", source, condition);

if (func == NULL)
if (!func)
return FALSE;

return func(watch->channel, condition & watch->condition, user_data);
Expand Down
65 changes: 30 additions & 35 deletions gweb/gresolv.c
Expand Up @@ -126,7 +126,7 @@ static void _debug(GResolv *resolv, const char *file, const char *caller,
va_list ap;
int len;

if (resolv->debug_func == NULL)
if (!resolv->debug_func)
return;

va_start(ap, format);
Expand Down Expand Up @@ -155,13 +155,13 @@ static void destroy_lookup(struct resolv_lookup *lookup)
debug(lookup->resolv, "lookup %p id %d ipv4 %p ipv6 %p",
lookup, lookup->id, lookup->ipv4_query, lookup->ipv6_query);

if (lookup->ipv4_query != NULL) {
if (lookup->ipv4_query) {
g_queue_remove(lookup->resolv->query_queue,
lookup->ipv4_query);
destroy_query(lookup->ipv4_query);
}

if (lookup->ipv6_query != NULL) {
if (lookup->ipv6_query) {
g_queue_remove(lookup->resolv->query_queue,
lookup->ipv6_query);
destroy_query(lookup->ipv6_query);
Expand Down Expand Up @@ -485,14 +485,10 @@ static void sort_and_return_results(struct resolv_lookup *lookup)

for (i = 0; i < lookup->nr_results; i++) {
if (lookup->results[i].dst.sa.sa_family == AF_INET) {
if (inet_ntop(AF_INET,
&lookup->results[i].dst.sin.sin_addr,
buf, sizeof(buf) - 1) == NULL)
if (!inet_ntop(AF_INET, &lookup->results[i].dst.sin.sin_addr, buf, sizeof(buf) - 1))
continue;
} else if (lookup->results[i].dst.sa.sa_family == AF_INET6) {
if (inet_ntop(AF_INET6,
&lookup->results[i].dst.sin6.sin6_addr,
buf, sizeof(buf) - 1) == NULL)
if (!inet_ntop(AF_INET6, &lookup->results[i].dst.sin6.sin6_addr, buf, sizeof(buf) - 1))
continue;
} else
continue;
Expand Down Expand Up @@ -542,21 +538,21 @@ static gboolean query_timeout(gpointer user_data)
g_queue_remove(resolv->query_queue, query);
destroy_query(query);

if (lookup->ipv4_query == NULL && lookup->ipv6_query == NULL)
if (!lookup->ipv4_query && !lookup->ipv6_query)
sort_and_return_results(lookup);

return FALSE;
}

static void free_nameserver(struct resolv_nameserver *nameserver)
{
if (nameserver == NULL)
if (!nameserver)
return;

if (nameserver->udp_watch > 0)
g_source_remove(nameserver->udp_watch);

if (nameserver->udp_channel != NULL) {
if (nameserver->udp_channel) {
g_io_channel_shutdown(nameserver->udp_channel, TRUE, NULL);
g_io_channel_unref(nameserver->udp_channel);
}
Expand All @@ -582,15 +578,15 @@ static int send_query(GResolv *resolv, const unsigned char *buf, int len)
GList *list;
int nr_ns;

if (resolv->nameserver_list == NULL)
if (!resolv->nameserver_list)
return -ENOENT;

for (list = g_list_first(resolv->nameserver_list), nr_ns = 0;
list; list = g_list_next(list), nr_ns++) {
struct resolv_nameserver *nameserver = list->data;
int sk, sent;

if (nameserver->udp_channel == NULL)
if (!nameserver->udp_channel)
continue;

sk = g_io_channel_unix_get_fd(nameserver->udp_channel);
Expand Down Expand Up @@ -637,7 +633,7 @@ static void add_result(struct resolv_lookup *lookup, int family,
int n = lookup->nr_results++;
lookup->results = g_try_realloc(lookup->results,
sizeof(struct sort_result) * (n + 1));
if (lookup->results == NULL)
if (!lookup->results)
return;

memset(&lookup->results[n], 0, sizeof(struct sort_result));
Expand Down Expand Up @@ -741,7 +737,7 @@ static void parse_response(struct resolv_nameserver *nameserver,
g_queue_remove(resolv->query_queue, query);
destroy_query(query);

if (lookup->ipv4_query == NULL && lookup->ipv6_query == NULL)
if (!lookup->ipv4_query && !lookup->ipv6_query)
sort_and_return_results(lookup);
}

Expand Down Expand Up @@ -807,8 +803,7 @@ static int connect_udp_channel(struct resolv_nameserver *nameserver)
char interface[IF_NAMESIZE];

memset(interface, 0, IF_NAMESIZE);
if (if_indextoname(nameserver->resolv->index,
interface) != NULL) {
if (if_indextoname(nameserver->resolv->index, interface)) {
if (setsockopt(sk, SOL_SOCKET, SO_BINDTODEVICE,
interface, IF_NAMESIZE) < 0) {
close(sk);
Expand All @@ -827,7 +822,7 @@ static int connect_udp_channel(struct resolv_nameserver *nameserver)
freeaddrinfo(rp);

nameserver->udp_channel = g_io_channel_unix_new(sk);
if (nameserver->udp_channel == NULL) {
if (!nameserver->udp_channel) {
close(sk);
return -ENOMEM;
}
Expand All @@ -849,7 +844,7 @@ GResolv *g_resolv_new(int index)
return NULL;

resolv = g_try_new0(GResolv, 1);
if (resolv == NULL)
if (!resolv)
return NULL;

resolv->ref_count = 1;
Expand All @@ -859,13 +854,13 @@ GResolv *g_resolv_new(int index)
resolv->next_lookup_id = 1;

resolv->query_queue = g_queue_new();
if (resolv->query_queue == NULL) {
if (!resolv->query_queue) {
g_free(resolv);
return NULL;
}

resolv->lookup_queue = g_queue_new();
if (resolv->lookup_queue == NULL) {
if (!resolv->lookup_queue) {
g_queue_free(resolv->query_queue);
g_free(resolv);
return NULL;
Expand All @@ -881,7 +876,7 @@ GResolv *g_resolv_new(int index)

GResolv *g_resolv_ref(GResolv *resolv)
{
if (resolv == NULL)
if (!resolv)
return NULL;

__sync_fetch_and_add(&resolv->ref_count, 1);
Expand All @@ -894,7 +889,7 @@ void g_resolv_unref(GResolv *resolv)
struct resolv_query *query;
struct resolv_lookup *lookup;

if (resolv == NULL)
if (!resolv)
return;

if (__sync_fetch_and_sub(&resolv->ref_count, 1) != 1)
Expand Down Expand Up @@ -923,7 +918,7 @@ void g_resolv_unref(GResolv *resolv)
void g_resolv_set_debug(GResolv *resolv, GResolvDebugFunc func,
gpointer user_data)
{
if (resolv == NULL)
if (!resolv)
return;

resolv->debug_func = func;
Expand All @@ -935,11 +930,11 @@ bool g_resolv_add_nameserver(GResolv *resolv, const char *address,
{
struct resolv_nameserver *nameserver;

if (resolv == NULL)
if (!resolv)
return false;

nameserver = g_try_new0(struct resolv_nameserver, 1);
if (nameserver == NULL)
if (!nameserver)
return false;

nameserver->address = g_strdup(address);
Expand All @@ -962,7 +957,7 @@ bool g_resolv_add_nameserver(GResolv *resolv, const char *address,

void g_resolv_flush_nameservers(GResolv *resolv)
{
if (resolv == NULL)
if (!resolv)
return;

flush_nameservers(resolv);
Expand All @@ -974,7 +969,7 @@ static gint add_query(struct resolv_lookup *lookup, const char *hostname, int ty
unsigned char buf[4096];
int len;

if (query == NULL)
if (!query)
return -ENOMEM;

len = res_mkquery(ns_o_query, hostname, ns_c_in, type,
Expand Down Expand Up @@ -1013,12 +1008,12 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname,
{
struct resolv_lookup *lookup;

if (resolv == NULL)
if (!resolv)
return 0;

debug(resolv, "hostname %s", hostname);

if (resolv->nameserver_list == NULL) {
if (!resolv->nameserver_list) {
int i;

for (i = 0; i < resolv->res.nscount; i++) {
Expand All @@ -1039,12 +1034,12 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname,
g_resolv_add_nameserver(resolv, buf, 53, 0);
}

if (resolv->nameserver_list == NULL)
if (!resolv->nameserver_list)
g_resolv_add_nameserver(resolv, "127.0.0.1", 53, 0);
}

lookup = g_try_new0(struct resolv_lookup, 1);
if (lookup == NULL)
if (!lookup)
return 0;

lookup->resolv = resolv;
Expand Down Expand Up @@ -1089,7 +1084,7 @@ bool g_resolv_cancel_lookup(GResolv *resolv, guint id)
list = g_queue_find_custom(resolv->lookup_queue,
GUINT_TO_POINTER(id), compare_lookup_id);

if (list == NULL)
if (!list)
return false;

lookup = list->data;
Expand All @@ -1104,7 +1099,7 @@ bool g_resolv_cancel_lookup(GResolv *resolv, guint id)

bool g_resolv_set_address_family(GResolv *resolv, int family)
{
if (resolv == NULL)
if (!resolv)
return false;

if (family != AF_UNSPEC && family != AF_INET && family != AF_INET6)
Expand Down

0 comments on commit 98cd55e

Please sign in to comment.