diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2013-09-24 17:14:25 +0300 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2013-09-29 17:01:07 +0300 |
| commit | df65753b0a8a2cafe887fdd038282805396259ce (patch) | |
| tree | 4a14ca174a12da248e7d37756d042640d2198647 /gobex | |
| parent | c9f3b81d07cd25e6fbab62278ee21895fe077b68 (diff) | |
| download | bluez-df65753b0a8a2cafe887fdd038282805396259ce.tar.gz | |
gobex: Revert g_obex_pending_req_abort to static pending_req_abort
This reverts the changes introduced in
9095deb82572112fc0870095bf2222964610eafe that made pending_req_abort
public which is not necessary considering g_obex_cancel_req can do the
same and is safe to call even if the request is not pending.
Diffstat (limited to 'gobex')
| -rw-r--r-- | gobex/gobex.c | 4 | ||||
| -rw-r--r-- | gobex/gobex.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/gobex/gobex.c b/gobex/gobex.c index deeab4078..8c08b1e35 100644 --- a/gobex/gobex.c +++ b/gobex/gobex.c @@ -685,7 +685,7 @@ static int pending_pkt_cmp(gconstpointer a, gconstpointer b) return (p->id - id); } -gboolean g_obex_pending_req_abort(GObex *obex, GError **err) +static gboolean pending_req_abort(GObex *obex, GError **err) { struct pending_pkt *p = obex->pending_req; GObexPacket *req; @@ -729,7 +729,7 @@ gboolean g_obex_cancel_req(GObex *obex, guint req_id, gboolean remove_callback) struct pending_pkt *p; if (obex->pending_req && obex->pending_req->id == req_id) { - if (!g_obex_pending_req_abort(obex, NULL)) { + if (!pending_req_abort(obex, NULL)) { p = obex->pending_req; obex->pending_req = NULL; goto immediate_completion; diff --git a/gobex/gobex.h b/gobex/gobex.h index 3ac7b133f..76a224ed8 100644 --- a/gobex/gobex.h +++ b/gobex/gobex.h @@ -50,8 +50,6 @@ guint g_obex_send_req(GObex *obex, GObexPacket *req, int timeout, gboolean g_obex_cancel_req(GObex *obex, guint req_id, gboolean remove_callback); -gboolean g_obex_pending_req_abort(GObex *obex, GError **err); - gboolean g_obex_send_rsp(GObex *obex, guint8 rspcode, GError **err, guint8 first_hdr_type, ...); |