Skip to content

Commit 2988770

Browse files
committed
refactor: Rename out parameters to out_$something.
In preparation for supporting `out` as a type qualifier in parameters.
1 parent b03b571 commit 2988770

File tree

6 files changed

+116
-115
lines changed

6 files changed

+116
-115
lines changed

testing/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ sh_test(
1414
args = ["$(locations %s)" % f for f in CIMPLE_FILES] + [
1515
"-Wno-boolean-return",
1616
"-Wno-callback-names",
17+
"-Wno-enum-from-int",
1718
"+RTS",
1819
"-N4",
1920
"-RTS",

toxcore/Messenger.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -775,31 +775,31 @@ int m_set_statusmessage(Messenger *m, const uint8_t *status, uint16_t length)
775775
}
776776

777777
non_null()
778-
static bool userstatus_from_int(uint8_t status, Userstatus *out)
778+
static bool userstatus_from_int(uint8_t status, Userstatus *out_enum)
779779
{
780780
switch (status) {
781781
case USERSTATUS_NONE: {
782-
*out = USERSTATUS_NONE;
782+
*out_enum = USERSTATUS_NONE;
783783
return true;
784784
}
785785

786786
case USERSTATUS_AWAY: {
787-
*out = USERSTATUS_AWAY;
787+
*out_enum = USERSTATUS_AWAY;
788788
return true;
789789
}
790790

791791
case USERSTATUS_BUSY: {
792-
*out = USERSTATUS_BUSY;
792+
*out_enum = USERSTATUS_BUSY;
793793
return true;
794794
}
795795

796796
case USERSTATUS_INVALID: {
797-
*out = USERSTATUS_INVALID;
797+
*out_enum = USERSTATUS_INVALID;
798798
return true;
799799
}
800800

801801
default: {
802-
*out = USERSTATUS_INVALID;
802+
*out_enum = USERSTATUS_INVALID;
803803
return false;
804804
}
805805
}

toxcore/group_pack.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,46 +26,46 @@
2626
#include "network.h"
2727
#include "util.h"
2828

29-
bool group_privacy_state_from_int(uint8_t value, Group_Privacy_State *out)
29+
bool group_privacy_state_from_int(uint8_t value, Group_Privacy_State *out_enum)
3030
{
3131
switch (value) {
3232
case GI_PUBLIC: {
33-
*out = GI_PUBLIC;
33+
*out_enum = GI_PUBLIC;
3434
return true;
3535
}
3636

3737
case GI_PRIVATE: {
38-
*out = GI_PRIVATE;
38+
*out_enum = GI_PRIVATE;
3939
return true;
4040
}
4141

4242
default: {
43-
*out = GI_PUBLIC;
43+
*out_enum = GI_PUBLIC;
4444
return false;
4545
}
4646
}
4747
}
4848

49-
bool group_voice_state_from_int(uint8_t value, Group_Voice_State *out)
49+
bool group_voice_state_from_int(uint8_t value, Group_Voice_State *out_enum)
5050
{
5151
switch (value) {
5252
case GV_ALL: {
53-
*out = GV_ALL;
53+
*out_enum = GV_ALL;
5454
return true;
5555
}
5656

5757
case GV_MODS: {
58-
*out = GV_MODS;
58+
*out_enum = GV_MODS;
5959
return true;
6060
}
6161

6262
case GV_FOUNDER: {
63-
*out = GV_FOUNDER;
63+
*out_enum = GV_FOUNDER;
6464
return true;
6565
}
6666

6767
default: {
68-
*out = GV_ALL;
68+
*out_enum = GV_ALL;
6969
return false;
7070
}
7171
}

toxcore/group_pack.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ non_null()
3434
bool gc_load_unpack_group(GC_Chat *chat, Bin_Unpack *bu);
3535

3636
non_null()
37-
bool group_privacy_state_from_int(uint8_t value, Group_Privacy_State *out);
37+
bool group_privacy_state_from_int(uint8_t value, Group_Privacy_State *out_enum);
3838
non_null()
39-
bool group_voice_state_from_int(uint8_t value, Group_Voice_State *out);
39+
bool group_voice_state_from_int(uint8_t value, Group_Voice_State *out_enum);
4040

4141
#endif /* C_TOXCORE_TOXCORE_GROUP_PACK_H */

toxcore/tox_event.c

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -725,216 +725,216 @@ bool tox_event_pack(const Tox_Event *event, Bin_Pack *bp)
725725
}
726726

727727
non_null()
728-
static bool tox_event_type_from_int(uint32_t value, Tox_Event_Type *out)
728+
static bool tox_event_type_from_int(uint32_t value, Tox_Event_Type *out_enum)
729729
{
730730
switch (value) {
731731
case TOX_EVENT_SELF_CONNECTION_STATUS: {
732-
*out = TOX_EVENT_SELF_CONNECTION_STATUS;
732+
*out_enum = TOX_EVENT_SELF_CONNECTION_STATUS;
733733
return true;
734734
}
735735

736736
case TOX_EVENT_FRIEND_REQUEST: {
737-
*out = TOX_EVENT_FRIEND_REQUEST;
737+
*out_enum = TOX_EVENT_FRIEND_REQUEST;
738738
return true;
739739
}
740740

741741
case TOX_EVENT_FRIEND_CONNECTION_STATUS: {
742-
*out = TOX_EVENT_FRIEND_CONNECTION_STATUS;
742+
*out_enum = TOX_EVENT_FRIEND_CONNECTION_STATUS;
743743
return true;
744744
}
745745

746746
case TOX_EVENT_FRIEND_LOSSY_PACKET: {
747-
*out = TOX_EVENT_FRIEND_LOSSY_PACKET;
747+
*out_enum = TOX_EVENT_FRIEND_LOSSY_PACKET;
748748
return true;
749749
}
750750

751751
case TOX_EVENT_FRIEND_LOSSLESS_PACKET: {
752-
*out = TOX_EVENT_FRIEND_LOSSLESS_PACKET;
752+
*out_enum = TOX_EVENT_FRIEND_LOSSLESS_PACKET;
753753
return true;
754754
}
755755

756756
case TOX_EVENT_FRIEND_NAME: {
757-
*out = TOX_EVENT_FRIEND_NAME;
757+
*out_enum = TOX_EVENT_FRIEND_NAME;
758758
return true;
759759
}
760760

761761
case TOX_EVENT_FRIEND_STATUS: {
762-
*out = TOX_EVENT_FRIEND_STATUS;
762+
*out_enum = TOX_EVENT_FRIEND_STATUS;
763763
return true;
764764
}
765765

766766
case TOX_EVENT_FRIEND_STATUS_MESSAGE: {
767-
*out = TOX_EVENT_FRIEND_STATUS_MESSAGE;
767+
*out_enum = TOX_EVENT_FRIEND_STATUS_MESSAGE;
768768
return true;
769769
}
770770

771771
case TOX_EVENT_FRIEND_MESSAGE: {
772-
*out = TOX_EVENT_FRIEND_MESSAGE;
772+
*out_enum = TOX_EVENT_FRIEND_MESSAGE;
773773
return true;
774774
}
775775

776776
case TOX_EVENT_FRIEND_READ_RECEIPT: {
777-
*out = TOX_EVENT_FRIEND_READ_RECEIPT;
777+
*out_enum = TOX_EVENT_FRIEND_READ_RECEIPT;
778778
return true;
779779
}
780780

781781
case TOX_EVENT_FRIEND_TYPING: {
782-
*out = TOX_EVENT_FRIEND_TYPING;
782+
*out_enum = TOX_EVENT_FRIEND_TYPING;
783783
return true;
784784
}
785785

786786
case TOX_EVENT_FILE_CHUNK_REQUEST: {
787-
*out = TOX_EVENT_FILE_CHUNK_REQUEST;
787+
*out_enum = TOX_EVENT_FILE_CHUNK_REQUEST;
788788
return true;
789789
}
790790

791791
case TOX_EVENT_FILE_RECV: {
792-
*out = TOX_EVENT_FILE_RECV;
792+
*out_enum = TOX_EVENT_FILE_RECV;
793793
return true;
794794
}
795795

796796
case TOX_EVENT_FILE_RECV_CHUNK: {
797-
*out = TOX_EVENT_FILE_RECV_CHUNK;
797+
*out_enum = TOX_EVENT_FILE_RECV_CHUNK;
798798
return true;
799799
}
800800

801801
case TOX_EVENT_FILE_RECV_CONTROL: {
802-
*out = TOX_EVENT_FILE_RECV_CONTROL;
802+
*out_enum = TOX_EVENT_FILE_RECV_CONTROL;
803803
return true;
804804
}
805805

806806
case TOX_EVENT_CONFERENCE_INVITE: {
807-
*out = TOX_EVENT_CONFERENCE_INVITE;
807+
*out_enum = TOX_EVENT_CONFERENCE_INVITE;
808808
return true;
809809
}
810810

811811
case TOX_EVENT_CONFERENCE_CONNECTED: {
812-
*out = TOX_EVENT_CONFERENCE_CONNECTED;
812+
*out_enum = TOX_EVENT_CONFERENCE_CONNECTED;
813813
return true;
814814
}
815815

816816
case TOX_EVENT_CONFERENCE_PEER_LIST_CHANGED: {
817-
*out = TOX_EVENT_CONFERENCE_PEER_LIST_CHANGED;
817+
*out_enum = TOX_EVENT_CONFERENCE_PEER_LIST_CHANGED;
818818
return true;
819819
}
820820

821821
case TOX_EVENT_CONFERENCE_PEER_NAME: {
822-
*out = TOX_EVENT_CONFERENCE_PEER_NAME;
822+
*out_enum = TOX_EVENT_CONFERENCE_PEER_NAME;
823823
return true;
824824
}
825825

826826
case TOX_EVENT_CONFERENCE_TITLE: {
827-
*out = TOX_EVENT_CONFERENCE_TITLE;
827+
*out_enum = TOX_EVENT_CONFERENCE_TITLE;
828828
return true;
829829
}
830830

831831
case TOX_EVENT_CONFERENCE_MESSAGE: {
832-
*out = TOX_EVENT_CONFERENCE_MESSAGE;
832+
*out_enum = TOX_EVENT_CONFERENCE_MESSAGE;
833833
return true;
834834
}
835835

836836
case TOX_EVENT_GROUP_PEER_NAME: {
837-
*out = TOX_EVENT_GROUP_PEER_NAME;
837+
*out_enum = TOX_EVENT_GROUP_PEER_NAME;
838838
return true;
839839
}
840840

841841
case TOX_EVENT_GROUP_PEER_STATUS: {
842-
*out = TOX_EVENT_GROUP_PEER_STATUS;
842+
*out_enum = TOX_EVENT_GROUP_PEER_STATUS;
843843
return true;
844844
}
845845

846846
case TOX_EVENT_GROUP_TOPIC: {
847-
*out = TOX_EVENT_GROUP_TOPIC;
847+
*out_enum = TOX_EVENT_GROUP_TOPIC;
848848
return true;
849849
}
850850

851851
case TOX_EVENT_GROUP_PRIVACY_STATE: {
852-
*out = TOX_EVENT_GROUP_PRIVACY_STATE;
852+
*out_enum = TOX_EVENT_GROUP_PRIVACY_STATE;
853853
return true;
854854
}
855855

856856
case TOX_EVENT_GROUP_VOICE_STATE: {
857-
*out = TOX_EVENT_GROUP_VOICE_STATE;
857+
*out_enum = TOX_EVENT_GROUP_VOICE_STATE;
858858
return true;
859859
}
860860

861861
case TOX_EVENT_GROUP_TOPIC_LOCK: {
862-
*out = TOX_EVENT_GROUP_TOPIC_LOCK;
862+
*out_enum = TOX_EVENT_GROUP_TOPIC_LOCK;
863863
return true;
864864
}
865865

866866
case TOX_EVENT_GROUP_PEER_LIMIT: {
867-
*out = TOX_EVENT_GROUP_PEER_LIMIT;
867+
*out_enum = TOX_EVENT_GROUP_PEER_LIMIT;
868868
return true;
869869
}
870870

871871
case TOX_EVENT_GROUP_PASSWORD: {
872-
*out = TOX_EVENT_GROUP_PASSWORD;
872+
*out_enum = TOX_EVENT_GROUP_PASSWORD;
873873
return true;
874874
}
875875

876876
case TOX_EVENT_GROUP_MESSAGE: {
877-
*out = TOX_EVENT_GROUP_MESSAGE;
877+
*out_enum = TOX_EVENT_GROUP_MESSAGE;
878878
return true;
879879
}
880880

881881
case TOX_EVENT_GROUP_PRIVATE_MESSAGE: {
882-
*out = TOX_EVENT_GROUP_PRIVATE_MESSAGE;
882+
*out_enum = TOX_EVENT_GROUP_PRIVATE_MESSAGE;
883883
return true;
884884
}
885885

886886
case TOX_EVENT_GROUP_CUSTOM_PACKET: {
887-
*out = TOX_EVENT_GROUP_CUSTOM_PACKET;
887+
*out_enum = TOX_EVENT_GROUP_CUSTOM_PACKET;
888888
return true;
889889
}
890890

891891
case TOX_EVENT_GROUP_CUSTOM_PRIVATE_PACKET: {
892-
*out = TOX_EVENT_GROUP_CUSTOM_PRIVATE_PACKET;
892+
*out_enum = TOX_EVENT_GROUP_CUSTOM_PRIVATE_PACKET;
893893
return true;
894894
}
895895

896896
case TOX_EVENT_GROUP_INVITE: {
897-
*out = TOX_EVENT_GROUP_INVITE;
897+
*out_enum = TOX_EVENT_GROUP_INVITE;
898898
return true;
899899
}
900900

901901
case TOX_EVENT_GROUP_PEER_JOIN: {
902-
*out = TOX_EVENT_GROUP_PEER_JOIN;
902+
*out_enum = TOX_EVENT_GROUP_PEER_JOIN;
903903
return true;
904904
}
905905

906906
case TOX_EVENT_GROUP_PEER_EXIT: {
907-
*out = TOX_EVENT_GROUP_PEER_EXIT;
907+
*out_enum = TOX_EVENT_GROUP_PEER_EXIT;
908908
return true;
909909
}
910910

911911
case TOX_EVENT_GROUP_SELF_JOIN: {
912-
*out = TOX_EVENT_GROUP_SELF_JOIN;
912+
*out_enum = TOX_EVENT_GROUP_SELF_JOIN;
913913
return true;
914914
}
915915

916916
case TOX_EVENT_GROUP_JOIN_FAIL: {
917-
*out = TOX_EVENT_GROUP_JOIN_FAIL;
917+
*out_enum = TOX_EVENT_GROUP_JOIN_FAIL;
918918
return true;
919919
}
920920

921921
case TOX_EVENT_GROUP_MODERATION: {
922-
*out = TOX_EVENT_GROUP_MODERATION;
922+
*out_enum = TOX_EVENT_GROUP_MODERATION;
923923
return true;
924924
}
925925

926926
case TOX_EVENT_DHT_GET_NODES_RESPONSE: {
927-
*out = TOX_EVENT_DHT_GET_NODES_RESPONSE;
927+
*out_enum = TOX_EVENT_DHT_GET_NODES_RESPONSE;
928928
return true;
929929
}
930930

931931
case TOX_EVENT_INVALID: {
932-
*out = TOX_EVENT_INVALID;
932+
*out_enum = TOX_EVENT_INVALID;
933933
return true;
934934
}
935935

936936
default: {
937-
*out = TOX_EVENT_INVALID;
937+
*out_enum = TOX_EVENT_INVALID;
938938
return false;
939939
}
940940
}

0 commit comments

Comments
 (0)