diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-06-06 14:29:58 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-09-17 10:20:34 +0200 |
| commit | 0556b2a330c37fa870161c4bf8191f7915ee3333 (patch) | |
| tree | ee4d23ac7cc1f9812e578c7a40f72fab24df5000 | |
| parent | b5134cdc308d3caac15a9c20ab954a0548c01f24 (diff) | |
| download | json-dbus-bridge-0556b2a330c37fa870161c4bf8191f7915ee3333.tar.gz json-dbus-bridge-0556b2a330c37fa870161c4bf8191f7915ee3333.tar.xz | |
[bridge_request] remove unnecessary pointer
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | src/bridge.c | 3 | ||||
| -rw-r--r-- | src/bridge_request.c | 5 | ||||
| -rw-r--r-- | src/bridge_request.h | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/bridge.c b/src/bridge.c index 4a24757..08e626d 100644 --- a/src/bridge.c +++ b/src/bridge.c @@ -169,8 +169,7 @@ void bridge_handle_cgi(evutil_socket_t s, short flags, void *data) if (!self->head) { fprintf(stderr, "%s malloc\n", __FUNCTION__); self->head = malloc(sizeof(bridge_request_t)); - ret = bridge_request_init(self->head, self, - self->dbus_connection, self->socket); + ret = bridge_request_init(self->head, self, self->socket); if (ret != 0) { fprintf(stdout, "bridge_request_init failed: %d", ret); return; diff --git a/src/bridge_request.c b/src/bridge_request.c index e7e90f8..bf376ed 100644 --- a/src/bridge_request.c +++ b/src/bridge_request.c @@ -31,14 +31,13 @@ #include "bridge_request.h" #include "bridge.h" -int bridge_request_init(bridge_request_t *self, bridge_t *bridge, DBusConnection *dbus_connection, int socket) +int bridge_request_init(bridge_request_t *self, bridge_t *bridge, int socket) { if (FCGX_InitRequest(&self->request, socket, FCGI_FAIL_ACCEPT_ON_INTR) != 0) { return EINVAL; } self->tokener = json_tokener_new(); - self->dbus_connection = dbus_connection; self->bridge = bridge; self->next = 0; self->response = json_object_new_object(); @@ -695,7 +694,7 @@ int bridge_request_call_json_dbus(bridge_request_t *self, struct json_object *in if ((ret = bridge_request_to_dbus(self, in_json, &msg)) != 0) return ret; - if (!dbus_connection_send_with_reply(self->dbus_connection, msg, + if (!dbus_connection_send_with_reply(self->bridge->dbus_connection, msg, &pending, -1)) { bridge_request_error(self, "Out of memory."); ret = ENOMEM; diff --git a/src/bridge_request.h b/src/bridge_request.h index 3d6de17..0e838e8 100644 --- a/src/bridge_request.h +++ b/src/bridge_request.h @@ -47,13 +47,12 @@ struct bridge_request { FCGX_Request request; int id; struct json_tokener *tokener; - DBusConnection *dbus_connection; bridge_t *bridge; bridge_request_t *next; struct json_object *response; }; -int bridge_request_init(bridge_request_t *self, bridge_t *bridge, DBusConnection *dbus_connection, int socket); +int bridge_request_init(bridge_request_t *self, bridge_t *bridge, int socket); int bridge_request_destroy(bridge_request_t *self); int bridge_request_accept(bridge_request_t *self); |