fix fallthrough warnings

This commit is contained in:
Carsten Haitzler 2017-08-04 12:35:27 +09:00
parent a2afa0afd2
commit 03aeb1d463
11 changed files with 90 additions and 53 deletions

View File

@ -1624,7 +1624,9 @@ e_comp_e_object_layer_get(const E_Object *obj)
case E_GADCON_CLIENT_TYPE:
gc = ((E_Gadcon_Client *)(void *)(obj))->gadcon;
EINA_SAFETY_ON_NULL_RETURN_VAL(gc, 0);
EINA_FALLTHROUGH;
/* no break */
case E_GADCON_TYPE:
if (!gc) gc = (E_Gadcon *)obj;
if (gc->shelf) return gc->shelf->layer;

View File

@ -718,7 +718,9 @@ _e_drag_win_get(const E_Drop_Handler *h, int xdnd)
case E_GADCON_CLIENT_TYPE:
gc = ((E_Gadcon_Client *)(void *)(h->obj))->gadcon;
if (!gc) return 0;
EINA_FALLTHROUGH;
/* no break */
case E_GADCON_TYPE:
if (!gc) gc = (E_Gadcon *)h->obj;
@ -821,7 +823,9 @@ _e_dnd_object_layer_get(E_Drop_Handler *h)
case E_GADCON_CLIENT_TYPE:
/* add 1 to ensure we're above a potential receiving gadcon */
adjust = 1;
EINA_FALLTHROUGH;
/* no break */
default:
adjust += e_comp_e_object_layer_get(obj);
}

View File

@ -5945,6 +5945,8 @@ _e_fm2_typebuf_match(Evas_Object *obj, int next)
x++;
break;
}
EINA_FALLTHROUGH;
/* no break */
case 1:
_e_fm2_icon_desel_any(obj);

View File

@ -1000,6 +1000,9 @@ _e_fm_main_udisks2_volume_mounts_update(E_Volume *v, Eldbus_Message_Iter *arr3,
if (m) mounts = eina_list_append(mounts, m);
}
while (eldbus_message_iter_next(fuckyouglib));
EINA_FALLTHROUGH;
/* no break */
default: continue;
}
}

View File

@ -713,17 +713,25 @@ e_intl_locale_parts_get(const char *locale)
case 0:
language[tmp_idx] = 0;
tmp_idx = 0;
EINA_FALLTHROUGH;
/* no break */
case 1:
territory[tmp_idx] = 0;
tmp_idx = 0;
EINA_FALLTHROUGH;
/* no break */
case 2:
codeset[tmp_idx] = 0;
tmp_idx = 0;
EINA_FALLTHROUGH;
/* no break */
case 3:
modifier[tmp_idx] = 0;
EINA_FALLTHROUGH;
/* no break */
default:
break;

View File

@ -1570,20 +1570,24 @@ _e_main_test_formats(void)
evas_object_image_file_set(im, buff, key);
switch (evas_object_image_load_error_get(im))
{
default:
e_error_message_show(_("Enlightenment found Evas can't load '%s' files. "
"Check Evas has '%s' loader support.\n"), t, t);
if (i) _e_main_shutdown(-1);
break;
case EVAS_LOAD_ERROR_CORRUPT_FILE:
case EVAS_LOAD_ERROR_DOES_NOT_EXIST:
case EVAS_LOAD_ERROR_PERMISSION_DENIED:
e_error_message_show(_("Enlightenment cannot access test image for '%s' filetype. "
"Check your install for setup issues.\n"), t);
EINA_FALLTHROUGH;
// fallthrough anyway as normally these files should work
case EVAS_LOAD_ERROR_NONE:
snprintf(b, sizeof(b), ".%s", types[i]);
efreet_icon_extension_add(b);
break;
default:
e_error_message_show(_("Enlightenment found Evas can't load '%s' files. "
"Check Evas has '%s' loader support.\n"), t, t);
if (i) _e_main_shutdown(-1);
break;
}
}

View File

@ -407,6 +407,8 @@ _config_update(E_Randr2 *r, E_Config_Randr2 *cfg, Eina_Bool update_only)
ecore_timer_loop_add(2, _config_ask_dialog, eina_strdup(s->info.name));
else
ecore_timer_loop_add(0.01, _config_ask_dialog, eina_strdup(s->info.name));
EINA_FALLTHROUGH;
/* no break */
case E_RANDR2_POLICY_NONE:
cs->rel_mode = E_RANDR2_RELATIVE_NONE;
break;

View File

@ -1153,11 +1153,17 @@ _cpufreq_event_cb_powersave(void *data EINA_UNUSED, int type, void *event)
_cpufreq_set_governor("conservative");
break;
}
EINA_FALLTHROUGH;
/* no break */
case E_POWERSAVE_MODE_EXTREME:
case E_POWERSAVE_MODE_FREEZE:
if (has_powersave)
_cpufreq_set_governor("powersave");
break;
default:
break;
}
return ECORE_CALLBACK_PASS_ON;

View File

@ -716,66 +716,68 @@ _pulse_pa_state_cb(pa_context *context, void *data)
break;
case PA_CONTEXT_READY:
{
ctx->connect = NULL;
ctx->connected = EINA_TRUE;
pa_context_set_subscribe_callback(context, _subscribe_cb, ctx);
if (!(o = pa_context_subscribe(context, (pa_subscription_mask_t)
(PA_SUBSCRIPTION_MASK_SINK|
PA_SUBSCRIPTION_MASK_SOURCE|
PA_SUBSCRIPTION_MASK_SINK_INPUT|
PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT|
PA_SUBSCRIPTION_MASK_CLIENT|
PA_SUBSCRIPTION_MASK_SERVER|
PA_SUBSCRIPTION_MASK_CARD),
NULL, NULL)))
{
ERR("pa_context_subscribe() failed");
return;
}
pa_operation_unref(o);
ctx->connect = NULL;
ctx->connected = EINA_TRUE;
pa_context_set_subscribe_callback(context, _subscribe_cb, ctx);
if (!(o = pa_context_subscribe(context, (pa_subscription_mask_t)
(PA_SUBSCRIPTION_MASK_SINK|
PA_SUBSCRIPTION_MASK_SOURCE|
PA_SUBSCRIPTION_MASK_SINK_INPUT|
PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT|
PA_SUBSCRIPTION_MASK_CLIENT|
PA_SUBSCRIPTION_MASK_SERVER|
PA_SUBSCRIPTION_MASK_CARD),
NULL, NULL)))
{
ERR("pa_context_subscribe() failed");
return;
}
pa_operation_unref(o);
if (!(o = pa_context_get_sink_info_list(context, _sink_cb, ctx)))
{
ERR("pa_context_get_sink_info_list() failed");
return;
}
pa_operation_unref(o);
if (!(o = pa_context_get_sink_info_list(context, _sink_cb, ctx)))
{
ERR("pa_context_get_sink_info_list() failed");
return;
}
pa_operation_unref(o);
if (!(o = pa_context_get_sink_input_info_list(context,
_sink_input_cb,
ctx)))
{
ERR("pa_context_get_sink_input_info_list() failed");
return;
}
pa_operation_unref(o);
if (!(o = pa_context_get_source_info_list(context, _source_cb,
if (!(o = pa_context_get_sink_input_info_list(context,
_sink_input_cb,
ctx)))
{
ERR("pa_context_get_source_info_list() failed");
return;
}
pa_operation_unref(o);
{
ERR("pa_context_get_sink_input_info_list() failed");
return;
}
pa_operation_unref(o);
if (!(o = pa_context_get_server_info(context, _server_info_cb,
ctx)))
{
ERR("pa_context_get_server_info() failed");
return;
}
pa_operation_unref(o);
break;
}
if (!(o = pa_context_get_source_info_list(context, _source_cb,
ctx)))
{
ERR("pa_context_get_source_info_list() failed");
return;
}
pa_operation_unref(o);
if (!(o = pa_context_get_server_info(context, _server_info_cb,
ctx)))
{
ERR("pa_context_get_server_info() failed");
return;
}
pa_operation_unref(o);
break;
case PA_CONTEXT_FAILED:
WRN("PA_CONTEXT_FAILED");
if (!ctx->connect)
ctx->connect = ecore_timer_loop_add(1, _pulse_connect, data);
goto err;
case PA_CONTEXT_TERMINATED:
ERR("PA_CONTEXT_TERMINATE:");
EINA_FALLTHROUGH;
/* no break */
default:
if (ctx->connect)
{

View File

@ -240,6 +240,9 @@ _cpuclock_event_cb_powersave(void *data, int type, void *event)
_cpuclock_set_governor("conservative");
break;
}
EINA_FALLTHROUGH;
/* no break */
case E_POWERSAVE_MODE_EXTREME:
default:
if (has_powersave)

View File

@ -330,6 +330,7 @@ setup_lock(void)
case EEXIST:
exs->disp++;
EINA_FALLTHROUGH;
/* no break */
case EAGAIN:
continue;
case 0: