(menu displaylist) Some more cleanups

This commit is contained in:
twinaphex 2019-09-18 05:40:06 +02:00
parent ed77d46cc9
commit b0a8f5d775

View File

@ -638,55 +638,46 @@ static unsigned menu_displaylist_parse_system_info(menu_displaylist_info_t *info
switch (state) switch (state)
{ {
case FRONTEND_POWERSTATE_NONE: case FRONTEND_POWERSTATE_NONE:
tmp2[copied] = ' '; string_add_space_fast (tmp2, copied );
tmp2[copied+1] = '\0'; copied = strlcat(tmp2,
strlcat(tmp2,
msg_hash_to_str( msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), sizeof(tmp2)); MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), sizeof(tmp2));
break; break;
case FRONTEND_POWERSTATE_NO_SOURCE: case FRONTEND_POWERSTATE_NO_SOURCE:
tmp2[copied] = ' '; string_add_space_fast (tmp2, copied );
tmp2[copied+1] = '('; string_add_pair_open_fast (tmp2, copied+1);
tmp2[copied+2] = '\0';
copied = strlcat(tmp2, copied = strlcat(tmp2,
msg_hash_to_str( msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_NO_SOURCE), MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_NO_SOURCE),
sizeof(tmp2)); sizeof(tmp2));
tmp2[copied] = ')'; string_add_pair_close_fast(tmp2, copied );
tmp2[copied+1] = '\0';
break; break;
case FRONTEND_POWERSTATE_CHARGING: case FRONTEND_POWERSTATE_CHARGING:
tmp2[copied] = ' '; string_add_space_fast (tmp2, copied );
tmp2[copied+1] = '('; string_add_pair_open_fast (tmp2, copied+1);
tmp2[copied+2] = '\0';
copied = strlcat(tmp2, copied = strlcat(tmp2,
msg_hash_to_str( msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGING), MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGING),
sizeof(tmp2)); sizeof(tmp2));
tmp2[copied] = ')'; string_add_pair_close_fast(tmp2, copied );
tmp2[copied+1] = '\0';
break; break;
case FRONTEND_POWERSTATE_CHARGED: case FRONTEND_POWERSTATE_CHARGED:
tmp2[copied] = ' '; string_add_space_fast (tmp2, copied );
tmp2[copied+1] = '('; string_add_pair_open_fast (tmp2, copied+1);
tmp2[copied+2] = '\0';
copied = strlcat(tmp2, copied = strlcat(tmp2,
msg_hash_to_str( msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGED), MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGED),
sizeof(tmp2)); sizeof(tmp2));
tmp2[copied] = ')'; string_add_pair_close_fast(tmp2, copied );
tmp2[copied+1] = '\0';
break; break;
case FRONTEND_POWERSTATE_ON_POWER_SOURCE: case FRONTEND_POWERSTATE_ON_POWER_SOURCE:
tmp2[copied] = ' '; string_add_space_fast (tmp2, copied );
tmp2[copied+1] = '('; string_add_pair_open_fast (tmp2, copied+1);
tmp2[copied+2] = '\0';
copied = strlcat(tmp2, copied = strlcat(tmp2,
msg_hash_to_str( msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_DISCHARGING), MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_DISCHARGING),
sizeof(tmp2)); sizeof(tmp2));
tmp2[copied] = ')'; string_add_pair_close_fast(tmp2, copied );
tmp2[copied+1] = '\0';
break; break;
} }