diff --git a/sml/include/sml/sml.h b/sml/include/sml/sml.h index e04fa63..0b2477e 100644 --- a/sml/include/sml/sml.h +++ b/sml/include/sml/sml.h @@ -42,8 +42,6 @@ void sml_file_write(sml_file *file); void sml_file_free(sml_file *file); void sml_file_print(sml_file *file); -void mc_sml_hexdump(unsigned char *buffer, size_t buffer_len); - #ifdef __cplusplus } #endif diff --git a/sml/include/sml/sml_transport.h b/sml/include/sml/sml_transport.h index a5abbe3..92b1bb2 100644 --- a/sml/include/sml/sml_transport.h +++ b/sml/include/sml/sml_transport.h @@ -26,9 +26,9 @@ extern "C" { #endif -//void (*mc_sml_transport_receiver_fun)(unsigned char *buffer, size_t buffer_len) = 0; +//void (*sml_transport_receiver_fun)(unsigned char *buffer, size_t buffer_len) = 0; -void mc_sml_transport_listen(int fd, void (*mc_sml_transport_receiver)(unsigned char *buffer, size_t buffer_len)); +void sml_transport_listen(int fd, void (*sml_transport_receiver)(unsigned char *buffer, size_t buffer_len)); #ifdef __cplusplus } #endif diff --git a/sml/src/sml.c b/sml/src/sml.c index 888f034..4961965 100644 --- a/sml/src/sml.c +++ b/sml/src/sml.c @@ -29,25 +29,6 @@ // EDL meter must provide at least 250 bytes as a receive buffer #define SML_FILE_BUFFER_LENGTH 512 -/* -void mc_sml_hexdump_rest(sml_buffer *buf) { - int i; - unsigned char *rest = sml_buf_get_current_buf(buf); - for (i = 0; i < buf->buffer_len - buf->cursor; i++) { - printf("%02X ", (unsigned char) rest[i]); - if ((i + 1) % 8 == 0) { - printf("\n"); - } - } - printf("\n"); -} -*/ - -void mc_sml_hexdump(unsigned char *buffer, size_t buffer_len) { - printf("SML dump (%zu bytes)\n", buffer_len); - hexdump(buffer, buffer_len); -} - sml_file *sml_file_parse(unsigned char *buffer, size_t buffer_len) { //buffer += 8; diff --git a/sml/src/sml_transport.c b/sml/src/sml_transport.c index 02bd336..fced91f 100644 --- a/sml/src/sml_transport.c +++ b/sml/src/sml_transport.c @@ -28,7 +28,7 @@ #define MC_SML_BUFFER_LEN 8096 // Invokes on every incoming SML message the given method. The buffer is freed afterwards. -void mc_sml_transport_listen(int fd, void (*mc_sml_transport_receiver)(unsigned char *buffer, size_t buffer_len)) { +void sml_transport_listen(int fd, void (*sml_transport_receiver)(unsigned char *buffer, size_t buffer_len)) { fd_set readfds; FD_ZERO(&readfds); @@ -81,7 +81,7 @@ void mc_sml_transport_listen(int fd, void (*mc_sml_transport_receiver)(unsigned char *sml_file = (char *) malloc(i); memcpy(sml_file, &(buf[0]), i); // without the SML transport stuff - mc_sml_transport_receiver((unsigned char *)(sml_file ), i); + sml_transport_receiver((unsigned char *)(sml_file ), i); free(sml_file); i = -1; esc = 0;