ghopp
/
token
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

finalize definition and initialization macro for for cclass and add -Wall to all Makefiles

master
Georg Hopp 14 years ago
parent
ae5751fe25
commit
e090c797bb
8 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Makefile.am
  2. 2
      Makefile.in
  3. 8
      include/token/cclass.h
  4. 2
      src/Makefile.am
  5. 2
      src/Makefile.in
  6. 6
      src/cclass.c
  7. 6
      tests/Makefile.am
  8. 6
      tests/Makefile.in

2
Makefile.am
View File

@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
bin_PROGRAMS = create_token bin_PROGRAMS = create_token
create_token_SOURCES = base64.c createToken.c create_token_SOURCES = base64.c createToken.c
create_token_LDADD = src/libtoken.la $(LIBOBJS) create_token_LDADD = src/libtoken.la $(LIBOBJS)
create_token_CFLAGS = -I include
create_token_CFLAGS = -Wall -I include
EXTRA_DIST = base64.h EXTRA_DIST = base64.h

2
Makefile.in
View File

@ -242,7 +242,7 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
create_token_SOURCES = base64.c createToken.c create_token_SOURCES = base64.c createToken.c
create_token_LDADD = src/libtoken.la $(LIBOBJS) create_token_LDADD = src/libtoken.la $(LIBOBJS)
create_token_CFLAGS = -I include
create_token_CFLAGS = -Wall -I include
EXTRA_DIST = base64.h EXTRA_DIST = base64.h
SUBDIRS = src include tests SUBDIRS = src include tests
all: config.h all: config.h

8
include/token/cclass.h
View File

@ -41,7 +41,7 @@
(jCtor)jsonConst, \ (jCtor)jsonConst, \
(dtor)__destruct, \ (dtor)__destruct, \
(jTo)toJson \ (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_PTR_SIZE sizeof(struct CCLASS *)
#define CCLASS_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); void delete(void * _object);
struct json_object * toJson(void * _object); struct json_object * toJson(void * _object);
int isObject(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 new(class, ...) _new((__##class), __VA_ARGS__)
#define newFromJson(class, json) _newFromJson((__##class), (json)) #define newFromJson(class, json) _newFromJson((__##class), (json))

2
src/Makefile.am
View File

@ -2,5 +2,5 @@ ACLOCAL_AMFLAGS = -I m4
lib_LTLIBRARIES = libtoken.la lib_LTLIBRARIES = libtoken.la
libtoken_la_SOURCES = cclass.c crypt.c dyntype.c dyntype/hash.c packet.c 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 libtoken_la_LDFLAGS = -version-info 0:0:0

2
src/Makefile.in
View File

@ -209,7 +209,7 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
lib_LTLIBRARIES = libtoken.la lib_LTLIBRARIES = libtoken.la
libtoken_la_SOURCES = cclass.c crypt.c dyntype.c dyntype/hash.c packet.c 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 libtoken_la_LDFLAGS = -version-info 0:0:0
all: all-am all: all-am

6
src/cclass.c
View File

@ -24,7 +24,7 @@
void * void *
_new(const void * _class, ...)
_new(const _CCLASS _class, ...)
{ {
const _CCLASS class = _class; const _CCLASS class = _class;
void * object = calloc(1, class->size); void * object = calloc(1, class->size);
@ -43,7 +43,7 @@ _new(const void * _class, ...)
} }
void * void *
_newFromJson(const void * _class, struct json_object * json)
_newFromJson(const _CCLASS _class, struct json_object * json)
{ {
const struct CCLASS * class = _class; const struct CCLASS * class = _class;
void * object = calloc(1, class->size); void * object = calloc(1, class->size);
@ -91,7 +91,7 @@ isObject(void * _object)
} }
int int
_instanceOf(const void * _class, void * _object)
_instanceOf(const _CCLASS _class, void * _object)
{ {
const struct CCLASS ** class = _object; const struct CCLASS ** class = _object;

6
tests/Makefile.am
View File

@ -6,14 +6,14 @@ check_PROGRAMS = cclassTest cryptTest packetTest
cclassTest_SOURCES = runtest.c cclassTest.c mock/class.c ../src/cclass.c cclassTest_SOURCES = runtest.c cclassTest.c mock/class.c ../src/cclass.c
cclassTest_LDADD = $(LIBOBJS) 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_SOURCES = runtest.c cryptTest.c ../src/cclass.c ../src/crypt.c
cryptTest_LDADD = $(LIBOBJS) 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_SOURCES = runtest.c packetTest.c ../src/cclass.c ../src/packet.c ../src/dyntype.c ../src/dyntype/hash.c
packetTest_LDADD = $(LIBOBJS) packetTest_LDADD = $(LIBOBJS)
packetTest_CFLAGS = -I ../include -I .. -I .
packetTest_CFLAGS = -Wall -I ../include -I .. -I .
EXTRA_DIST = runtest.h mock/class.h EXTRA_DIST = runtest.h mock/class.h

6
tests/Makefile.in
View File

@ -210,13 +210,13 @@ ACLOCAL_AMFLAGS = -I m4
TESTS_ENVIRONMENT = valgrind --error-exitcode=123 --leak-check=full --quiet TESTS_ENVIRONMENT = valgrind --error-exitcode=123 --leak-check=full --quiet
cclassTest_SOURCES = runtest.c cclassTest.c mock/class.c ../src/cclass.c cclassTest_SOURCES = runtest.c cclassTest.c mock/class.c ../src/cclass.c
cclassTest_LDADD = $(LIBOBJS) 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_SOURCES = runtest.c cryptTest.c ../src/cclass.c ../src/crypt.c
cryptTest_LDADD = $(LIBOBJS) 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_SOURCES = runtest.c packetTest.c ../src/cclass.c ../src/packet.c ../src/dyntype.c ../src/dyntype/hash.c
packetTest_LDADD = $(LIBOBJS) packetTest_LDADD = $(LIBOBJS)
packetTest_CFLAGS = -I ../include -I .. -I .
packetTest_CFLAGS = -Wall -I ../include -I .. -I .
EXTRA_DIST = runtest.h mock/class.h EXTRA_DIST = runtest.h mock/class.h
all: all-am all: all-am

Write Preview
Loading…
Cancel
Save