forked from enlightenment/enlightenment
fix a bunch of questionably valid null derefs from clang
SVN revision: 76807
This commit is contained in:
parent
f9b872ab6a
commit
ea61755d98
|
@ -33,21 +33,21 @@ _e_fm2_device_volume_setup(E_Volume *v)
|
|||
else if (((v->storage->vendor) && (v->storage->vendor[0])) &&
|
||||
((v->storage->model) && (v->storage->model[0])))
|
||||
{
|
||||
if (size[0] != '\0')
|
||||
if (size && (size[0] != '\0'))
|
||||
snprintf(label, sizeof(label) - 1, _("%s %s—%s"), v->storage->vendor, v->storage->model, size);
|
||||
else
|
||||
snprintf(label, sizeof(label) - 1, "%s %s", v->storage->vendor, v->storage->model);
|
||||
}
|
||||
else if ((v->storage->model) && (v->storage->model[0]))
|
||||
{
|
||||
if (size[0] != '\0')
|
||||
if (size && (size[0] != '\0'))
|
||||
snprintf(label, sizeof(label) - 1, _("%s—%s"), v->storage->model, size);
|
||||
else
|
||||
snprintf(label, sizeof(label) - 1, "%s", v->storage->model);
|
||||
}
|
||||
else if ((v->storage->vendor) && (v->storage->vendor[0]))
|
||||
{
|
||||
if (size[0] != '\0')
|
||||
if (size && (size[0] != '\0'))
|
||||
snprintf(label, sizeof(label) - 1, _("%s—%s"), v->storage->vendor, size);
|
||||
else
|
||||
snprintf(label, sizeof(label) - 1, "%s", v->storage->vendor);
|
||||
|
|
|
@ -3037,7 +3037,7 @@ _e_gadcon_client_cb_menu_post(void *data, E_Menu *m __UNUSED__)
|
|||
if (!(gcc = data)) return;
|
||||
if (gcc->gadcon) e_gadcon_locked_set(gcc->gadcon, 0);
|
||||
if (!gcc->menu) return;
|
||||
if (gcc->gadcon->shelf && (gcc->menu == gcc->gadcon->shelf->menu)) gcc->gadcon->shelf->menu = NULL;
|
||||
if (gcc->gadcon && gcc->gadcon->shelf && (gcc->menu == gcc->gadcon->shelf->menu)) gcc->gadcon->shelf->menu = NULL;
|
||||
e_object_del(E_OBJECT(gcc->menu));
|
||||
gcc->menu = NULL;
|
||||
}
|
||||
|
|
|
@ -449,7 +449,8 @@ _12_try_restore_configuration(void)
|
|||
}
|
||||
|
||||
// DEBUG
|
||||
DBG("E_RANDR: \tRestoring CRTC %d (index %d) in mode %s.", ci->xid, sc->index, (mode == Ecore_X_Randr_None) ? "(disabled)" : mi->name);
|
||||
if (mi)
|
||||
DBG("E_RANDR: \tRestoring CRTC %d (index %d) in mode %s.", ci->xid, sc->index, (mode == Ecore_X_Randr_None) ? "(disabled)" : mi->name);
|
||||
DBG("E_RANDR: \t\tUsed outputs:");
|
||||
EINA_LIST_FOREACH(outputs_list, outputs_iter, output_info)
|
||||
DBG("\t\t%s", output_info->name);
|
||||
|
|
|
@ -119,11 +119,11 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
|||
for (x = 0; x < cfdata->zone_count; x++)
|
||||
cfdata->bgs = eina_list_append(cfdata->bgs, eina_stringshare_add("theme_desklock_background"));
|
||||
|
||||
if (!e_util_strcmp(cfdata->bgs->data, "theme_desklock_background"))
|
||||
if (!e_util_strcmp(eina_list_data_get(cfdata->bgs), "theme_desklock_background"))
|
||||
cfdata->bg_method = E_DESKLOCK_BACKGROUND_METHOD_THEME_DESKLOCK;
|
||||
else if (!e_util_strcmp(cfdata->bgs->data, "theme_background"))
|
||||
else if (!e_util_strcmp(eina_list_data_get(cfdata->bgs), "theme_background"))
|
||||
cfdata->bg_method = E_DESKLOCK_BACKGROUND_METHOD_THEME;
|
||||
else if (!e_util_strcmp(cfdata->bgs->data, "user_background"))
|
||||
else if (!e_util_strcmp(eina_list_data_get(cfdata->bgs), "user_background"))
|
||||
cfdata->bg_method = E_DESKLOCK_BACKGROUND_METHOD_WALLPAPER;
|
||||
else
|
||||
cfdata->bg_method = E_DESKLOCK_BACKGROUND_METHOD_CUSTOM;
|
||||
|
|
|
@ -1113,7 +1113,7 @@ _e_qa_help_timer_helper(void)
|
|||
else
|
||||
/* someone's messing with the menu. joke's on them, we can dance all day */
|
||||
qa_mod->demo_state = 0;
|
||||
} while (mi->separator);
|
||||
} while (mi && mi->separator);
|
||||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
|
|
|
@ -219,7 +219,7 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__,
|
|||
/* List of individual tiling modes */
|
||||
cfdata->evas = evas;
|
||||
|
||||
_fill_zone_config(con->zones->data, cfdata);
|
||||
_fill_zone_config(eina_list_data_get(con->zones), cfdata);
|
||||
|
||||
e_widget_ilist_selected_set(cfdata->o_zonelist, 0);
|
||||
|
||||
|
|
Loading…
Reference in New Issue