small fixes

diff --git a/Makefile b/Makefile
index be9b51f4426b4298ec7edbc405c383bbd8a33dc1..2a0779a63bab9fb57de659eeeb99c30414d90db3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,12 +3,12 @@ dstdir = bin
 
 .PHONY: all run clean mrpropre mrpropre love debug doc man \
        test tests run-test run-tests run-test-more run-tests-more \
-       mess-run mess-clean mess-propre mess-doc mess-man \
+       mess-build mess-run mess-clean mess-propre mess-doc mess-man \
        mess-test mess-run-test mess-run-test-more \
        $(NAME) utils \
        MK MKTEST MKMAN
 
-all: $(NAME)
+all: mess-build $(NAME)
 
 # Sub makes:
 MK:
@@ -22,7 +22,7 @@ MKMAN:
 
 # Main buildables
 $(NAME): utils MK
-utils:
+utils: 
        @$(MAKE) -C src/cutils       DEBUG=$(DEBUG)
 check:
        @$(MAKE) -C src/cutils check DEBUG=$(DEBUG)
@@ -60,6 +60,8 @@ install: mess-install MK MKMAN
 uninstall: mess-uninstall MK MKMAN
 
 # Messages
+mess-build:
+       @echo ">>>>>>>>>> Running $(NAME)..."
 mess-run:
        @echo ">>>>>>>>>> Running $(NAME)..."
        @echo

diff --git a/src/cbook/cbook_csv.c b/src/cbook/cbook_csv.c
index eed2a5404565c68acdaf5a4b353eeea276f030ed..9348f7d102d03b18690ec4a2010a96421038bbcf 100755 (executable)
--- a/src/cbook/cbook_csv.c
+++ b/src/cbook/cbook_csv.c
@@ -93,6 +93,11 @@ int write_line(FILE *outfile, book_t *book, cstring_t *dataline, int header,
                                " field <%s>: %s\n", 
                                book->err_line, book->err_field, book->err_mess
                        );
+                       free(book->err_mess);
+                       book->err_mess = NULL;
+                       free(book->err_field);
+                       book->err_field = NULL;
+                       book->err_line = 0;
                }
        }
 
@@ -153,7 +158,7 @@ void one_field(FILE *outfile, book_t *book, line_t *field, char *data) {
                fprintf(stderr, "\n");
                for (size_t i = 0 ; i < field->bytes ; i++) {
                        unsigned char byte = (unsigned char)data[i];
-                       fprintf(stderr, "%s -- Byte %zu = %02X (%c)\n", 
+                       fprintf(stderr, "%s -- Byte %zu = 0x%02X (%c)\n", 
                                field->name, i+1, byte, byte);
                }
        }
@@ -214,9 +219,6 @@ void one_field(FILE *outfile, book_t *book, line_t *field, char *data) {
                                        cstring_add(tmp, bit);
                                        cstring_add(tmp, " = 0x");
                                        cstring_add(tmp, byte2);
-                                       cstring_add(tmp, " -- Ox");
-                                       cstring_add_car(tmp, 'A' + (x1 -10));
-                                       cstring_add_car(tmp, 'A' + (x2 -10));
                                        book->err_mess = cstring_convert(tmp);
                                }
 
@@ -236,9 +238,6 @@ void one_field(FILE *outfile, book_t *book, line_t *field, char *data) {
                                cstring_add(tmp, bit);
                                cstring_add(tmp, " = 0x");
                                cstring_add(tmp, byte2);
-                               cstring_add(tmp, " -- Ox");
-                               cstring_add_car(tmp, 'A' + (x1 -10));
-                               cstring_add_car(tmp, 'A' + (x2 -10));
                                book->err_mess = cstring_convert(tmp);
                        }
                        

diff --git a/src/cbook/makefile.d b/src/cbook/makefile.d
index 8eeaa0fccb24591132ccb4a3e4a2e89389289832..c7531c5ab270ef23f52dcfbb17051970f0114c6a 100644 (file)
--- a/src/cbook/makefile.d
+++ b/src/cbook/makefile.d
@@ -22,9 +22,7 @@ SOURCES=$(wildcard $(srcdir)/*.c)
 HEADERS=$(wildcard $(srcdir)/*.h)
 OBJECTS=$(SOURCES:%.c=%.o)
 
-# OBJECTS+=$($(dstdir)/libcutils.o)
-
-$(dstdir)/cbook: $(OBJECTS)
+$(dstdir)/cbook: $(OBJECTS) $(dstdir)/libcutils.o
        mkdir -p $(dstdir)
        $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) -o $@
 

diff --git a/src/cutils b/src/cutils
index e2b7943d32d4ec4d9c00f64b28a515e461c04056..201682e2328086431c86a36358ba5569d51048ad 160000 (submodule)
--- a/src/cutils
+++ b/src/cutils
@@ -1 +1 @@
-Subproject commit e2b7943d32d4ec4d9c00f64b28a515e461c04056
+Subproject commit 201682e2328086431c86a36358ba5569d51048ad

diff --git a/src/tests/makefile.d b/src/tests/makefile.d
index ba44212a10b34cc2528c54b421e06c19a01cb778..f4c61f31c880a4720fe5e8d8e36f3f2dde0a7cbd 100644 (file)
--- a/src/tests/makefile.d
+++ b/src/tests/makefile.d
@@ -5,7 +5,7 @@ dstdir = ../bin
 
 CFLAGS   += -Wall -pedantic -I./ -std=c99
 CXXFLAGS += -Wall -pedantic -I./
-LDFLAGS  += -lcheck
+LDFLAGS  += -lcheck $(dstdir)/libcutils.o
 
 ifdef DEBUG
 CFLAGS   += -ggdb -O0
@@ -29,7 +29,6 @@ run-test-more: test
 SOURCES=$(wildcard $(srcdir)/*.c)
 HEADERS=$(wildcard $(srcdir)/*.h)
 OBJECTS=$(SOURCES:%.c=%.o)
-OBJECTS+=$($(dstdir)/libcutils.o)
 
 $(dstdir)/tests: $(OBJECTS) $(dstdir)/libcutils-check.o
        mkdir -p $(dstdir)

diff --git a/src/tests/tests.c b/src/tests/tests.c
index affb5ccf65a9b83c0d2962af8b74ee954595fbfa..15c2b611d6a898c682c93d906e4000814e11e034 100755 (executable)
--- a/src/tests/tests.c
+++ b/src/tests/tests.c
@@ -1,4 +1,5 @@
 #include <check.h>
+#include <stdio.h>
 
 #include "cutils/cutils.h"
 #include "cutils/check/launcher.h"