From 09498e52bbc71496cd1b99ad5c8781783a864881 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 12 Jun 2014 13:37:16 -0400 Subject: [PATCH] gparam: Remove unnecessary conditionals around preconditions These cause a static analyzer to think we're trying to actually handle them being NULL, which is not the case. They both must not be NULL, period. No idea why the code was like this originally. Reviewed by mclasen on IRC. --- gobject/gparam.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gobject/gparam.c b/gobject/gparam.c index 80a553b..c69ee02 100644 --- a/gobject/gparam.c +++ b/gobject/gparam.c @@ -1062,11 +1062,8 @@ g_param_spec_pool_lookup (GParamSpecPool *pool, GParamSpec *pspec; gchar *delim; - if (!pool || !param_name) - { - g_return_val_if_fail (pool != NULL, NULL); - g_return_val_if_fail (param_name != NULL, NULL); - } + g_return_val_if_fail (pool != NULL, NULL); + g_return_val_if_fail (param_name != NULL, NULL); g_mutex_lock (&pool->mutex); -- 2.7.4