Skip to content

Commit 9324a97

Browse files
committed
fix: forgot an enum in the nodes request rename
see #2860
1 parent 81b1e4f commit 9324a97

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

Diff for: toxcore/events/dht_nodes_response.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ static bool tox_event_dht_nodes_response_unpack_into(
122122
const Tox_Event_Dht_Nodes_Response *tox_event_get_dht_nodes_response(
123123
const Tox_Event *event)
124124
{
125-
return event->type == TOX_EVENT_DHT_GET_NODES_RESPONSE ? event->data.dht_nodes_response : nullptr;
125+
return event->type == TOX_EVENT_DHT_NODES_RESPONSE ? event->data.dht_nodes_response : nullptr;
126126
}
127127

128128
Tox_Event_Dht_Nodes_Response *tox_event_dht_nodes_response_new(const Memory *mem)
@@ -156,7 +156,7 @@ static Tox_Event_Dht_Nodes_Response *tox_events_add_dht_nodes_response(Tox_Event
156156
}
157157

158158
Tox_Event event;
159-
event.type = TOX_EVENT_DHT_GET_NODES_RESPONSE;
159+
event.type = TOX_EVENT_DHT_NODES_RESPONSE;
160160
event.data.dht_nodes_response = dht_nodes_response;
161161

162162
if (!tox_events_add(events, &event)) {

Diff for: toxcore/tox_dispatch.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
601601
break;
602602
}
603603

604-
case TOX_EVENT_DHT_GET_NODES_RESPONSE: {
604+
case TOX_EVENT_DHT_NODES_RESPONSE: {
605605
if (dispatch->dht_nodes_response_callback != nullptr) {
606606
dispatch->dht_nodes_response_callback(event->data.dht_nodes_response, user_data);
607607
}

Diff for: toxcore/tox_event.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ const char *tox_event_type_to_string(Tox_Event_Type type)
133133
case TOX_EVENT_GROUP_MODERATION:
134134
return "TOX_EVENT_GROUP_MODERATION";
135135

136-
case TOX_EVENT_DHT_GET_NODES_RESPONSE:
137-
return "TOX_EVENT_DHT_GET_NODES_RESPONSE";
136+
case TOX_EVENT_DHT_NODES_RESPONSE:
137+
return "TOX_EVENT_DHT_NODES_RESPONSE";
138138

139139
case TOX_EVENT_INVALID:
140140
return "TOX_EVENT_INVALID";
@@ -350,7 +350,7 @@ bool tox_event_construct(Tox_Event *event, Tox_Event_Type type, const Memory *me
350350
break;
351351
}
352352

353-
case TOX_EVENT_DHT_GET_NODES_RESPONSE: {
353+
case TOX_EVENT_DHT_NODES_RESPONSE: {
354354
event->data.dht_nodes_response = tox_event_dht_nodes_response_new(mem);
355355
break;
356356
}
@@ -565,7 +565,7 @@ void tox_event_destruct(Tox_Event *event, const Memory *mem)
565565
break;
566566
}
567567

568-
case TOX_EVENT_DHT_GET_NODES_RESPONSE: {
568+
case TOX_EVENT_DHT_NODES_RESPONSE: {
569569
tox_event_dht_nodes_response_free(event->data.dht_nodes_response, mem);
570570
break;
571571
}
@@ -705,7 +705,7 @@ static bool tox_event_data_pack(Tox_Event_Type type, const Tox_Event_Data *data,
705705
case TOX_EVENT_GROUP_MODERATION:
706706
return tox_event_group_moderation_pack(data->group_moderation, bp);
707707

708-
case TOX_EVENT_DHT_GET_NODES_RESPONSE:
708+
case TOX_EVENT_DHT_NODES_RESPONSE:
709709
return tox_event_dht_nodes_response_pack(data->dht_nodes_response, bp);
710710

711711
case TOX_EVENT_INVALID:
@@ -923,8 +923,8 @@ static bool tox_event_type_from_int(uint32_t value, Tox_Event_Type *out_enum)
923923
return true;
924924
}
925925

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

@@ -1069,7 +1069,7 @@ static bool tox_event_data_unpack(Tox_Event_Type type, Tox_Event_Data *data, Bin
10691069
case TOX_EVENT_GROUP_MODERATION:
10701070
return tox_event_group_moderation_unpack(&data->group_moderation, bu, mem);
10711071

1072-
case TOX_EVENT_DHT_GET_NODES_RESPONSE:
1072+
case TOX_EVENT_DHT_NODES_RESPONSE:
10731073
return tox_event_dht_nodes_response_unpack(&data->dht_nodes_response, bu, mem);
10741074

10751075
case TOX_EVENT_INVALID:

Diff for: toxcore/tox_events.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ typedef enum Tox_Event_Type {
410410
TOX_EVENT_GROUP_JOIN_FAIL = 37,
411411
TOX_EVENT_GROUP_MODERATION = 38,
412412

413-
TOX_EVENT_DHT_GET_NODES_RESPONSE = 39,
413+
TOX_EVENT_DHT_NODES_RESPONSE = 39,
414414

415415
TOX_EVENT_INVALID = 255,
416416
} Tox_Event_Type;

0 commit comments

Comments
 (0)