diff --git a/lib/c/2006/labcomm2006_fd_reader.c b/lib/c/2006/labcomm2006_fd_reader.c index a9348320cfb728e57fdbd10813552bd3e45b684d..a8100ffbbc59b67fae55003b8cd7a2ecf4e56097 100644 --- a/lib/c/2006/labcomm2006_fd_reader.c +++ b/lib/c/2006/labcomm2006_fd_reader.c @@ -51,6 +51,10 @@ static int fd_alloc(struct labcomm2006_reader *r, r->data_size = BUFFER_SIZE; result = r->data_size; +#if 0 +// in-band version is not included in version 2006. +// This may be a place for version checking and/or printing +// a warning message if (version && version[0]) { char *tmp; @@ -62,6 +66,7 @@ static int fd_alloc(struct labcomm2006_reader *r, } labcomm2006_memory_free(r->memory, 1, tmp); } +#endif } return result; } diff --git a/lib/c/2006/labcomm2006_fd_writer.c b/lib/c/2006/labcomm2006_fd_writer.c index 159fa30bdb23c774d700b940a544161c10bbfa0c..0b1d47440505102baa009e2841e450925a0e0e14 100644 --- a/lib/c/2006/labcomm2006_fd_writer.c +++ b/lib/c/2006/labcomm2006_fd_writer.c @@ -54,8 +54,10 @@ static int fd_alloc(struct labcomm2006_writer *w, w->count = BUFFER_SIZE; w->pos = 0; if (version && version[0]) { +#if 0 labcomm2006_write_string(w, version); fd_flush(w, action_context); +#endif } } diff --git a/lib/c/2006/labcomm2006_private.h b/lib/c/2006/labcomm2006_private.h index 89fa6eecbcf63f455a8b38ff70753801c812b505..1efd360495033ca1d834e5aa1cc4730d9d948e3b 100644 --- a/lib/c/2006/labcomm2006_private.h +++ b/lib/c/2006/labcomm2006_private.h @@ -346,7 +346,7 @@ struct labcomm2006_writer { int labcomm2006_writer_alloc(struct labcomm2006_writer *w, struct labcomm2006_writer_action_context *action_context, - char *labcomm2006_version); + char *labcomm_version); int labcomm2006_writer_free(struct labcomm2006_writer *w, struct labcomm2006_writer_action_context *action_context); int labcomm2006_writer_start(struct labcomm2006_writer *w, diff --git a/lib/c/Makefile b/lib/c/Makefile index 966d17ccf8d13cca84bc2112143eb53c4f05ad3c..9ca491135c06e777591f801a9e8eb8098b9a6157 100644 --- a/lib/c/Makefile +++ b/lib/c/Makefile @@ -23,11 +23,11 @@ OBJS2006=2006/labcomm2006_memory.o \ 2006/labcomm2006_default_error_handler.o \ 2006/labcomm2006_default_memory.o \ 2006/labcomm2006_default_scheduler.o \ - 2006/labcomm2006_time.o labcomm_scheduler.o \ - 2006/labcomm2006_encoder.o labcomm_decoder.o \ + 2006/labcomm2006_time.o 2006/labcomm2006_scheduler.o \ + 2006/labcomm2006_encoder.o 2006/labcomm2006_decoder.o \ 2006/labcomm2006.o \ 2006/labcomm2006_dynamic_buffer_writer.o \ - 2006/labcomm2006_fd_reader.o labcomm_fd_writer.o \ + 2006/labcomm2006_fd_reader.o 2006/labcomm2006_fd_writer.o \ 2006/labcomm2006_pthread_scheduler.o OBJS=labcomm_memory.o \