Skip to content

Commit

Permalink
Put breaks inside case bracers
Browse files Browse the repository at this point in the history
  • Loading branch information
@JFreegman
JFreegman committed Dec 25, 2021
1 parent b8c7c2a commit d8397c9
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 26 deletions.
23 changes: 13 additions & 10 deletions toxav/msi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,8 +661,9 @@ static void handle_init(MSICall *call, const MSIMessage *msg)
if (invoke_callback(call, MSI_ON_INVITE) == -1) {
goto FAILURE;
}

break;
}
break;

case MSI_CALL_ACTIVE: {
/* If peer sent init while the call is already
Expand All @@ -685,8 +686,8 @@ static void handle_init(MSICall *call, const MSIMessage *msg)
/* If peer changed capabilities during re-call they will
* be handled accordingly during the next step
*/
break;
}
break;

case MSI_CALL_REQUESTED: // fall-through
case MSI_CALL_REQUESTING: {
Expand Down Expand Up @@ -716,8 +717,8 @@ static void handle_push(MSICall *call, const MSIMessage *msg)

switch (call->state) {
case MSI_CALL_ACTIVE: {
/* Only act if capabilities changed */
if (call->peer_capabilities != msg->capabilities.value) {
/* Only act if capabilities changed */
LOGGER_INFO(call->session->messenger->log, "Friend is changing capabilities to: %u", msg->capabilities.value);

call->peer_capabilities = msg->capabilities.value;
Expand All @@ -726,8 +727,9 @@ static void handle_push(MSICall *call, const MSIMessage *msg)
goto FAILURE;
}
}

break;
}
break;

case MSI_CALL_REQUESTING: {
LOGGER_INFO(call->session->messenger->log, "Friend answered our call");
Expand All @@ -739,15 +741,16 @@ static void handle_push(MSICall *call, const MSIMessage *msg)
if (invoke_callback(call, MSI_ON_START) == -1) {
goto FAILURE;
}

break;
}
break;

/* Pushes during initialization state are ignored */
case MSI_CALL_INACTIVE: // fall-through
case MSI_CALL_REQUESTED: {
/* Pushes during initialization state are ignored */
LOGGER_WARNING(call->session->messenger->log, "Ignoring invalid push");
break;
}
break;
}

return;
Expand Down Expand Up @@ -780,22 +783,22 @@ static void handle_pop(MSICall *call, const MSIMessage *msg)
/* Hangup */
LOGGER_INFO(call->session->messenger->log, "Friend hung up on us");
invoke_callback(call, MSI_ON_END);
break;
}
break;

case MSI_CALL_REQUESTING: {
/* Reject */
LOGGER_INFO(call->session->messenger->log, "Friend rejected our call");
invoke_callback(call, MSI_ON_END);
break;
}
break;

case MSI_CALL_REQUESTED: {
/* Cancel */
LOGGER_INFO(call->session->messenger->log, "Friend canceled call invite");
invoke_callback(call, MSI_ON_END);
break;
}
break;
}
}

Expand Down
21 changes: 14 additions & 7 deletions toxav/toxav.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -509,8 +509,9 @@ bool toxav_call_control(ToxAV *av, uint32_t friend_number, Toxav_Call_Control co
rc = TOXAV_ERR_CALL_CONTROL_INVALID_TRANSITION;
goto RETURN;
}

break;
}
break;

case TOXAV_CALL_CONTROL_PAUSE: {
/* Only act if not already paused */
Expand All @@ -528,8 +529,9 @@ bool toxav_call_control(ToxAV *av, uint32_t friend_number, Toxav_Call_Control co
rc = TOXAV_ERR_CALL_CONTROL_INVALID_TRANSITION;
goto RETURN;
}

break;
}
break;

case TOXAV_CALL_CONTROL_CANCEL: {
/* Hang up */
Expand All @@ -547,8 +549,9 @@ bool toxav_call_control(ToxAV *av, uint32_t friend_number, Toxav_Call_Control co
/* No mather the case, terminate the call */
call_kill_transmission(call);
call_remove(call);

break;
}
break;

case TOXAV_CALL_CONTROL_MUTE_AUDIO: {
if (call->msi_call->self_capabilities & MSI_CAP_R_AUDIO) {
Expand All @@ -563,8 +566,9 @@ bool toxav_call_control(ToxAV *av, uint32_t friend_number, Toxav_Call_Control co
rc = TOXAV_ERR_CALL_CONTROL_INVALID_TRANSITION;
goto RETURN;
}

break;
}
break;

case TOXAV_CALL_CONTROL_UNMUTE_AUDIO: {
if (call->msi_call->self_capabilities ^ MSI_CAP_R_AUDIO) {
Expand All @@ -579,8 +583,9 @@ bool toxav_call_control(ToxAV *av, uint32_t friend_number, Toxav_Call_Control co
rc = TOXAV_ERR_CALL_CONTROL_INVALID_TRANSITION;
goto RETURN;
}

break;
}
break;

case TOXAV_CALL_CONTROL_HIDE_VIDEO: {
if (call->msi_call->self_capabilities & MSI_CAP_R_VIDEO) {
Expand All @@ -595,8 +600,9 @@ bool toxav_call_control(ToxAV *av, uint32_t friend_number, Toxav_Call_Control co
rc = TOXAV_ERR_CALL_CONTROL_INVALID_TRANSITION;
goto RETURN;
}

break;
}
break;

case TOXAV_CALL_CONTROL_SHOW_VIDEO: {
if (call->msi_call->self_capabilities ^ MSI_CAP_R_VIDEO) {
Expand All @@ -611,8 +617,9 @@ bool toxav_call_control(ToxAV *av, uint32_t friend_number, Toxav_Call_Control co
rc = TOXAV_ERR_CALL_CONTROL_INVALID_TRANSITION;
goto RETURN;
}

break;
}
break;
}

RETURN:
Expand Down
20 changes: 11 additions & 9 deletions toxcore/group.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2312,33 +2312,32 @@ static void handle_direct_packet(Group_Chats *g_c, uint32_t groupnumber, const u
switch (data[0]) {
case PEER_INTRODUCED_ID: {
remove_connection_reason(g_c, g, connection_index, GROUPCHAT_CONNECTION_REASON_INTRODUCING);
break;
}

break;

case PEER_QUERY_ID: {
if (g->connections[connection_index].type != GROUPCHAT_CONNECTION_ONLINE) {
return;
}

send_peers(g_c, g, g->connections[connection_index].number, g->connections[connection_index].group_number);
break;
}

break;

case PEER_RESPONSE_ID: {
handle_send_peers(g_c, groupnumber, data + 1, length - 1, userdata);
break;
}

break;

case PEER_TITLE_ID: {
if (!g->title_fresh) {
settitle(g_c, groupnumber, -1, data + 1, length - 1, userdata);
}
}

break;
break;
}
}
}

Expand Down Expand Up @@ -2713,22 +2712,25 @@ static void handle_message_packet_group(Group_Chats *g_c, uint32_t groupnumber,
return;
// TODO(irungentoo):
}

break;
}
break;

case GROUP_MESSAGE_NAME_ID: {
if (!setnick(g_c, groupnumber, index, msg_data, msg_data_len, userdata, true)) {
return;
}

break;
}
break;

case GROUP_MESSAGE_TITLE_ID: {
if (!settitle(g_c, groupnumber, index, msg_data, msg_data_len, userdata)) {
return;
}

break;
}
break;

case PACKET_ID_MESSAGE: {
if (msg_data_len == 0) {
Expand Down

0 comments on commit d8397c9

Please sign in to comment.