From 185e731b7b235bbc77a9e8bb7be93e65c675e4a8 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Sat, 21 Aug 2010 13:52:25 +0000 Subject: [PATCH] Convert (hopefully) all comparisons to NULL Apply badzero.cocci, badnull.coci and badnull2.cocci This should convert all cases where there's a comparison to NULL to simpler forms. This patch applies the following transformations: code before patch ||code after patch =============================================================== return a == NULL; return !a; return a != NULL; return !!a; func(a == NULL); func(!a); func(a != NULL); func(!!a); b = a == NULL; b = !a; b = a != NULL; b = !!a; b = a == NULL ? c : d; b = !a ? c : d; b = a != NULL ? c : d; b = a ? c : d; other cases: a == NULL !a a != NULL a SVN revision: 51487 --- src/e_mod_config_box.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/e_mod_config_box.c b/src/e_mod_config_box.c index 00b1648..7421eef 100644 --- a/src/e_mod_config_box.c +++ b/src/e_mod_config_box.c @@ -291,7 +291,7 @@ _basic_apply_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata) Config_Box *cb; int is_new = 0; - if (cfdata->name == NULL) + if (!cfdata->name) return 0; cb = cfd->data; @@ -308,7 +308,7 @@ _basic_apply_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata) if (cb->name) eina_stringshare_del (cb->name); - if (cfdata->name != NULL) + if (cfdata->name) cb->name = eina_stringshare_add (cfdata->name); else cb->name = eina_stringshare_add (""); @@ -326,42 +326,42 @@ _basic_apply_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata) if (cb->exec) eina_stringshare_del (cb->exec); - if (cfdata->exec != NULL) + if (cfdata->exec) cb->exec = eina_stringshare_add (cfdata->exec); else cb->exec = eina_stringshare_add (""); if (cb->host) eina_stringshare_del (cb->host); - if (cfdata->host != NULL) + if (cfdata->host) cb->host = eina_stringshare_add (cfdata->host); else cb->host = eina_stringshare_add (""); if (cb->user) eina_stringshare_del (cb->user); - if (cfdata->user != NULL) + if (cfdata->user) cb->user = eina_stringshare_add (cfdata->user); else cb->user = eina_stringshare_add (""); if (cb->pass) eina_stringshare_del (cb->pass); - if (cfdata->pass != NULL) + if (cfdata->pass) cb->pass = eina_stringshare_add (cfdata->pass); else cb->pass = eina_stringshare_add (""); if (cb->new_path) eina_stringshare_del (cb->new_path); - if (cfdata->new_path != NULL) + if (cfdata->new_path) cb->new_path = eina_stringshare_add (cfdata->new_path); else cb->new_path = eina_stringshare_add (""); if (cb->cur_path) eina_stringshare_del (cb->cur_path); - if (cfdata->cur_path != NULL) + if (cfdata->cur_path) cb->cur_path = eina_stringshare_add (cfdata->cur_path); else cb->cur_path = eina_stringshare_add ("");