diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-05-27 16:29:08 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-06-03 17:08:09 +0200 |
| commit | c8d6f23e49a72e2c234271ec5204f687ee4f952e (patch) | |
| tree | 95fe756e270f01063d54e1d28a35b935126d532b | |
| parent | 40c8adb0ce31d7c5f10d22eb44c40701ad500a77 (diff) | |
| download | json-dbus-bridge-c8d6f23e49a72e2c234271ec5204f687ee4f952e.tar.gz json-dbus-bridge-c8d6f23e49a72e2c234271ec5204f687ee4f952e.tar.xz | |
[src] cleanup
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | demo/dbus-simple-service/Makefile.am | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/bridge.h | 2 | ||||
| -rw-r--r-- | src/bridge_request.c | 3 | ||||
| -rw-r--r-- | src/bridge_request.h | 6 |
5 files changed, 14 insertions, 6 deletions
diff --git a/demo/dbus-simple-service/Makefile.am b/demo/dbus-simple-service/Makefile.am index 7210b05..6d0cc3d 100644 --- a/demo/dbus-simple-service/Makefile.am +++ b/demo/dbus-simple-service/Makefile.am @@ -13,6 +13,9 @@ MAINTAINERCLEANFILES = \ CLEANFILES = \ com_pengutronix_devel_SystemInfo_xml.h +noinst_HEADERS = \ + systeminfo_skel.h + %_xml.h: %.xml echo "#define $(shell echo $@ | tr [a-z] [A-Z] | sed -e "s,-,_,g" | sed -e "s,.H,,g") \\" > $@ cat $< | \ @@ -29,7 +32,7 @@ dbus_simple_service_SOURCES = \ dbus-simple-service.c \ systeminfo_skel.c -systeminfo_skel.c: com_pengutronix_devel_SystemInfo_xml.h +$(srcdir)/systeminfo_skel.c: com_pengutronix_devel_SystemInfo_xml.h dbus_simple_service_LDADD = \ $(dbus_LIBS) diff --git a/src/Makefile.am b/src/Makefile.am index a703508..d47695a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,6 +11,10 @@ AM_CPPFLAGS = \ MAINTAINERCLEANFILES = \ Makefile.in +noinst_HEADERS = \ + bridge_request.h \ + bridge.h + # # binary # diff --git a/src/bridge.h b/src/bridge.h index 7539c3a..aaca58a 100644 --- a/src/bridge.h +++ b/src/bridge.h @@ -39,5 +39,5 @@ int bridge_destroy(bridge_t *self); int bridge_run(bridge_t *self); -#endif // BRIDGE_H +#endif /* BRIDGE_H */ diff --git a/src/bridge_request.c b/src/bridge_request.c index 4a128ae..bc71afe 100644 --- a/src/bridge_request.c +++ b/src/bridge_request.c @@ -23,7 +23,9 @@ #include <stdlib.h> #include <stdio.h> +#ifndef __STRICT_ANSI__ #define __STRICT_ANSI__ +#endif #include <json.h> #include <dbus/dbus.h> @@ -164,7 +166,6 @@ int bridge_request_dbus_params_basic(bridge_request_t *self, DBusMessageIter *it) { int int_value; - //int64_t ll_value; double double_value; const char *str_value; void *value = 0; diff --git a/src/bridge_request.h b/src/bridge_request.h index 5df9db5..945a520 100644 --- a/src/bridge_request.h +++ b/src/bridge_request.h @@ -32,7 +32,7 @@ typedef enum { error_origin_server = 1, error_origin_method = 2, error_origin_transport = 3, - error_origin_client = 4, + error_origin_client = 4 } error_origin_t; typedef enum { @@ -41,7 +41,7 @@ typedef enum { error_code_class_not_found = 3, error_code_method_not_found = 4, error_code_parameter_missmatch = 5, - error_code_permission_denied = 6, + error_code_permission_denied = 6 } error_code_t; struct bridge_request { @@ -60,5 +60,5 @@ int bridge_request_destroy(bridge_request_t *self); int bridge_request_accept(bridge_request_t *self); int bridge_request_handle(bridge_request_t *self); -#endif // BRIDGE_REQUEST_H +#endif /* BRIDGE_REQUEST_H */ |