Skip to content

Commit 2a5ae7d

Browse files
committed
Cleanup dead method and dependencies
`msgpack_unpacker_peek_next_object_type` was only called by `Unpacker_peek_next_type`, but that method was _also_ unused and [previously removed][1]. [1]: d04b10b
1 parent 2a9f889 commit 2a5ae7d

2 files changed

Lines changed: 0 additions & 89 deletions

File tree

ext/msgpack/unpacker.c

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -897,82 +897,6 @@ int msgpack_unpacker_skip(msgpack_unpacker_t* uk, size_t target_stack_depth)
897897
}
898898
}
899899

900-
int msgpack_unpacker_peek_next_object_type(msgpack_unpacker_t* uk)
901-
{
902-
int b = get_head_byte(uk);
903-
if(b < 0) {
904-
return b;
905-
}
906-
907-
SWITCH_RANGE_BEGIN(b)
908-
SWITCH_RANGE(b, 0x00, 0x7f) // Positive Fixnum
909-
return TYPE_INTEGER;
910-
911-
SWITCH_RANGE(b, 0xe0, 0xff) // Negative Fixnum
912-
return TYPE_INTEGER;
913-
914-
SWITCH_RANGE(b, 0xa0, 0xbf) // FixRaw
915-
return TYPE_RAW;
916-
917-
SWITCH_RANGE(b, 0x90, 0x9f) // FixArray
918-
return TYPE_ARRAY;
919-
920-
SWITCH_RANGE(b, 0x80, 0x8f) // FixMap
921-
return TYPE_MAP;
922-
923-
SWITCH_RANGE(b, 0xc0, 0xdf) // Variable
924-
switch(b) {
925-
case 0xc0: // nil
926-
return TYPE_NIL;
927-
928-
case 0xc2: // false
929-
case 0xc3: // true
930-
return TYPE_BOOLEAN;
931-
932-
case 0xca: // float
933-
case 0xcb: // double
934-
return TYPE_FLOAT;
935-
936-
case 0xcc: // unsigned int 8
937-
case 0xcd: // unsigned int 16
938-
case 0xce: // unsigned int 32
939-
case 0xcf: // unsigned int 64
940-
return TYPE_INTEGER;
941-
942-
case 0xd0: // signed int 8
943-
case 0xd1: // signed int 16
944-
case 0xd2: // signed int 32
945-
case 0xd3: // signed int 64
946-
return TYPE_INTEGER;
947-
948-
case 0xd9: // raw 8 / str 8
949-
case 0xda: // raw 16 / str 16
950-
case 0xdb: // raw 32 / str 32
951-
return TYPE_RAW;
952-
953-
case 0xc4: // bin 8
954-
case 0xc5: // bin 16
955-
case 0xc6: // bin 32
956-
return TYPE_RAW;
957-
958-
case 0xdc: // array 16
959-
case 0xdd: // array 32
960-
return TYPE_ARRAY;
961-
962-
case 0xde: // map 16
963-
case 0xdf: // map 32
964-
return TYPE_MAP;
965-
966-
default:
967-
return PRIMITIVE_INVALID_BYTE;
968-
}
969-
970-
SWITCH_RANGE_DEFAULT
971-
return PRIMITIVE_INVALID_BYTE;
972-
973-
SWITCH_RANGE_END
974-
}
975-
976900
int msgpack_unpacker_skip_nil(msgpack_unpacker_t* uk)
977901
{
978902
int b = get_head_byte(uk);

ext/msgpack/unpacker.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,6 @@ struct msgpack_unpacker_t {
7777

7878
#define UNPACKER_BUFFER_(uk) (&(uk)->buffer)
7979

80-
enum msgpack_unpacker_object_type {
81-
TYPE_NIL = 0,
82-
TYPE_BOOLEAN,
83-
TYPE_INTEGER,
84-
TYPE_FLOAT,
85-
TYPE_RAW,
86-
TYPE_ARRAY,
87-
TYPE_MAP,
88-
};
89-
9080
void msgpack_unpacker_static_init(void);
9181

9282
void msgpack_unpacker_static_destroy(void);
@@ -139,9 +129,6 @@ static inline VALUE msgpack_unpacker_get_last_object(msgpack_unpacker_t* uk)
139129
return uk->last_object;
140130
}
141131

142-
143-
int msgpack_unpacker_peek_next_object_type(msgpack_unpacker_t* uk);
144-
145132
int msgpack_unpacker_skip_nil(msgpack_unpacker_t* uk);
146133

147134
int msgpack_unpacker_read_array_header(msgpack_unpacker_t* uk, uint32_t* result_size);

0 commit comments

Comments
 (0)