From 7a3d1a768b9ac18dbbe737f97d76321f1fa054fd Mon Sep 17 00:00:00 2001
From: Sven Gestegard Robertz <sven.robertz@cs.lth.se>
Date: Fri, 14 Feb 2014 10:16:27 +0100
Subject: [PATCH] C library ver 2006 works with examples/simple
---
lib/c/2006/labcomm2006_fd_reader.c | 5 +++++
lib/c/2006/labcomm2006_fd_writer.c | 2 ++
lib/c/2006/labcomm2006_private.h | 2 +-
lib/c/Makefile | 6 +++---
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/lib/c/2006/labcomm2006_fd_reader.c b/lib/c/2006/labcomm2006_fd_reader.c
index a934832..a8100ff 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 159fa30..0b1d474 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 89fa6ee..1efd360 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 966d17c..9ca4911 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 \
--
GitLab