diff --git a/Makefile.am b/Makefile.am index ddae12f..2631db9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 bin_PROGRAMS = create_token create_token_SOURCES = base64.c createToken.c create_token_LDADD = src/libtoken.la $(LIBOBJS) -create_token_CFLAGS = -I include +create_token_CFLAGS = -Wall -I include EXTRA_DIST = base64.h diff --git a/Makefile.in b/Makefile.in index 647759d..6cee95e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -242,7 +242,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 create_token_SOURCES = base64.c createToken.c create_token_LDADD = src/libtoken.la $(LIBOBJS) -create_token_CFLAGS = -I include +create_token_CFLAGS = -Wall -I include EXTRA_DIST = base64.h SUBDIRS = src include tests all: config.h diff --git a/include/token/cclass.h b/include/token/cclass.h index d93981f..f5ea742 100644 --- a/include/token/cclass.h +++ b/include/token/cclass.h @@ -41,7 +41,7 @@ (jCtor)jsonConst, \ (dtor)__destruct, \ (jTo)toJson \ - }; const _CCLASS const __##class = &_class + }; const _CCLASS const __##class = (const _CCLASS const)&_class @@ -62,12 +62,12 @@ typedef struct CCLASS { #define CCLASS_PTR_SIZE sizeof(struct CCLASS *) #define CCLASS_SIZE sizeof(struct CCLASS) -void * _new(const void * _class, ...); -void * _newFromJson(const void * _class, struct json_object * json); +void * _new(const _CCLASS _class, ...); +void * _newFromJson(const _CCLASS _class, struct json_object * json); void delete(void * _object); struct json_object * toJson(void * _object); int isObject(void * _object); -int _instanceOf(const void * _class, void * _object); +int _instanceOf(const _CCLASS _class, void * _object); #define new(class, ...) _new((__##class), __VA_ARGS__) #define newFromJson(class, json) _newFromJson((__##class), (json)) diff --git a/src/Makefile.am b/src/Makefile.am index 73888f9..fcf1dfa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,5 +2,5 @@ ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES = libtoken.la libtoken_la_SOURCES = cclass.c crypt.c dyntype.c dyntype/hash.c packet.c -libtoken_la_CFLAGS = -I ../include +libtoken_la_CFLAGS = -Wall -I ../include libtoken_la_LDFLAGS = -version-info 0:0:0 diff --git a/src/Makefile.in b/src/Makefile.in index 84a00fc..7015ef7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -209,7 +209,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES = libtoken.la libtoken_la_SOURCES = cclass.c crypt.c dyntype.c dyntype/hash.c packet.c -libtoken_la_CFLAGS = -I ../include +libtoken_la_CFLAGS = -Wall -I ../include libtoken_la_LDFLAGS = -version-info 0:0:0 all: all-am diff --git a/src/cclass.c b/src/cclass.c index 41bc04b..9b16bb0 100644 --- a/src/cclass.c +++ b/src/cclass.c @@ -24,7 +24,7 @@ void * -_new(const void * _class, ...) +_new(const _CCLASS _class, ...) { const _CCLASS class = _class; void * object = calloc(1, class->size); @@ -43,7 +43,7 @@ _new(const void * _class, ...) } void * -_newFromJson(const void * _class, struct json_object * json) +_newFromJson(const _CCLASS _class, struct json_object * json) { const struct CCLASS * class = _class; void * object = calloc(1, class->size); @@ -91,7 +91,7 @@ isObject(void * _object) } int -_instanceOf(const void * _class, void * _object) +_instanceOf(const _CCLASS _class, void * _object) { const struct CCLASS ** class = _object; diff --git a/tests/Makefile.am b/tests/Makefile.am index e311c09..3ce9add 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,14 +6,14 @@ check_PROGRAMS = cclassTest cryptTest packetTest cclassTest_SOURCES = runtest.c cclassTest.c mock/class.c ../src/cclass.c cclassTest_LDADD = $(LIBOBJS) -cclassTest_CFLAGS = -I ../include -I .. -I . +cclassTest_CFLAGS = -Wall -I ../include -I .. -I . cryptTest_SOURCES = runtest.c cryptTest.c ../src/cclass.c ../src/crypt.c cryptTest_LDADD = $(LIBOBJS) -cryptTest_CFLAGS = -I ../include -I .. -I . +cryptTest_CFLAGS = -Wall -I ../include -I .. -I . packetTest_SOURCES = runtest.c packetTest.c ../src/cclass.c ../src/packet.c ../src/dyntype.c ../src/dyntype/hash.c packetTest_LDADD = $(LIBOBJS) -packetTest_CFLAGS = -I ../include -I .. -I . +packetTest_CFLAGS = -Wall -I ../include -I .. -I . EXTRA_DIST = runtest.h mock/class.h diff --git a/tests/Makefile.in b/tests/Makefile.in index 6ab3cf7..1a22ea4 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -210,13 +210,13 @@ ACLOCAL_AMFLAGS = -I m4 TESTS_ENVIRONMENT = valgrind --error-exitcode=123 --leak-check=full --quiet cclassTest_SOURCES = runtest.c cclassTest.c mock/class.c ../src/cclass.c cclassTest_LDADD = $(LIBOBJS) -cclassTest_CFLAGS = -I ../include -I .. -I . +cclassTest_CFLAGS = -Wall -I ../include -I .. -I . cryptTest_SOURCES = runtest.c cryptTest.c ../src/cclass.c ../src/crypt.c cryptTest_LDADD = $(LIBOBJS) -cryptTest_CFLAGS = -I ../include -I .. -I . +cryptTest_CFLAGS = -Wall -I ../include -I .. -I . packetTest_SOURCES = runtest.c packetTest.c ../src/cclass.c ../src/packet.c ../src/dyntype.c ../src/dyntype/hash.c packetTest_LDADD = $(LIBOBJS) -packetTest_CFLAGS = -I ../include -I .. -I . +packetTest_CFLAGS = -Wall -I ../include -I .. -I . EXTRA_DIST = runtest.h mock/class.h all: all-am