diff --git a/sml/include/sml/sml_number.h b/sml/include/sml/sml_number.h index 6f1400f..50b6286 100644 --- a/sml/include/sml/sml_number.h +++ b/sml/include/sml/sml_number.h @@ -34,8 +34,7 @@ void *sml_number_init(u64 number, unsigned char type, int size); // SML_TYPE_NUMBER_32, SML_TYPE_NUMBER_64) void *sml_number_parse(sml_buffer *buf, unsigned char type, int max_size); -//void sml_number_write(unsigned char type, int size, u64 value, sml_buffer *buf); -void sml_number_write_new(void *np, unsigned char type, int size, sml_buffer *buf); +void sml_number_write(void *np, unsigned char type, int size, sml_buffer *buf); void sml_number_free(void *np); @@ -57,14 +56,14 @@ void sml_number_free(void *np); #define sml_i32_parse(buf) (i32 *) sml_number_parse(buf, SML_TYPE_INTEGER, SML_TYPE_NUMBER_32) #define sml_i64_parse(buf) (i64 *) sml_number_parse(buf, SML_TYPE_INTEGER, SML_TYPE_NUMBER_64) -#define sml_u8_write(n, buf) sml_number_write_new(n, SML_TYPE_UNSIGNED, SML_TYPE_NUMBER_8, buf) -#define sml_u16_write(n, buf) sml_number_write_new(n, SML_TYPE_UNSIGNED, SML_TYPE_NUMBER_16, buf) -#define sml_u32_write(n, buf) sml_number_write_new(n, SML_TYPE_UNSIGNED, SML_TYPE_NUMBER_32, buf) -#define sml_u64_write(n, buf) sml_number_write_new(n, SML_TYPE_UNSIGNED, SML_TYPE_NUMBER_64, buf) -#define sml_i8_write(n, buf) sml_number_write_new(n, SML_TYPE_INTEGER, SML_TYPE_NUMBER_8, buf) -#define sml_i16_write(n, buf) sml_number_write_new(n, SML_TYPE_INTEGER, SML_TYPE_NUMBER_16, buf) -#define sml_i32_write(n, buf) sml_number_write_new(n, SML_TYPE_INTEGER, SML_TYPE_NUMBER_32, buf) -#define sml_i64_write(n, buf) sml_number_write_new(n, SML_TYPE_INTEGER, SML_TYPE_NUMBER_64, buf) +#define sml_u8_write(n, buf) sml_number_write(n, SML_TYPE_UNSIGNED, SML_TYPE_NUMBER_8, buf) +#define sml_u16_write(n, buf) sml_number_write(n, SML_TYPE_UNSIGNED, SML_TYPE_NUMBER_16, buf) +#define sml_u32_write(n, buf) sml_number_write(n, SML_TYPE_UNSIGNED, SML_TYPE_NUMBER_32, buf) +#define sml_u64_write(n, buf) sml_number_write(n, SML_TYPE_UNSIGNED, SML_TYPE_NUMBER_64, buf) +#define sml_i8_write(n, buf) sml_number_write(n, SML_TYPE_INTEGER, SML_TYPE_NUMBER_8, buf) +#define sml_i16_write(n, buf) sml_number_write(n, SML_TYPE_INTEGER, SML_TYPE_NUMBER_16, buf) +#define sml_i32_write(n, buf) sml_number_write(n, SML_TYPE_INTEGER, SML_TYPE_NUMBER_32, buf) +#define sml_i64_write(n, buf) sml_number_write(n, SML_TYPE_INTEGER, SML_TYPE_NUMBER_64, buf) typedef u8 sml_unit; diff --git a/sml/src/sml_number.c b/sml/src/sml_number.c index 683fa44..90bc94b 100644 --- a/sml/src/sml_number.c +++ b/sml/src/sml_number.c @@ -79,22 +79,7 @@ void *sml_number_parse(sml_buffer *buf, unsigned char type, int max_size) { return np; } -/* -void sml_number_write(unsigned char type, int size, u64 value, sml_buffer *buf) { - sml_buf_set_type_and_length(buf, type, size); - int i; - u64 mask = 0xFF; - mask <<= (8 * (size - 1)); - - for (i = 0; i < size; i++) { - buf->buffer[buf->cursor + i] = (unsigned char) ((mask & value) >> (8 * (size - i - 1))); - mask >>= 8; - } - buf->cursor += size; -} -*/ - -void sml_number_write_new(void *np, unsigned char type, int size, sml_buffer *buf) { +void sml_number_write(void *np, unsigned char type, int size, sml_buffer *buf) { if (np == 0) { sml_buf_optional_write(buf); return;