diff options
Diffstat (limited to 'obexd')
| -rw-r--r-- | obexd/client/session.c | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/obexd/client/session.c b/obexd/client/session.c index 39c82e631..d6da0a7fe 100644 --- a/obexd/client/session.c +++ b/obexd/client/session.c @@ -1121,15 +1121,11 @@ static int session_process_setpath(struct pending_request *p, GError **err) p->req_id = g_obex_setpath(p->session->obex, first, setpath_cb, p, err); if (*err != NULL) - goto fail; + return (*err)->code; p->session->p = p; return 0; - -fail: - pending_request_free(p); - return (*err)->code; } guint obc_session_setpath(struct obc_session *session, const char *path, @@ -1213,15 +1209,11 @@ static int session_process_mkdir(struct pending_request *p, GError **err) p->req_id = g_obex_mkdir(p->session->obex, req->srcname, async_cb, p, err); if (*err != NULL) - goto fail; + return (*err)->code; p->session->p = p; return 0; - -fail: - pending_request_free(p); - return (*err)->code; } guint obc_session_mkdir(struct obc_session *session, const char *folder, @@ -1255,15 +1247,11 @@ static int session_process_copy(struct pending_request *p, GError **err) p->req_id = g_obex_copy(p->session->obex, req->srcname, req->destname, async_cb, p, err); if (*err != NULL) - goto fail; + return (*err)->code; p->session->p = p; return 0; - -fail: - pending_request_free(p); - return (*err)->code; } guint obc_session_copy(struct obc_session *session, const char *srcname, @@ -1298,15 +1286,11 @@ static int session_process_move(struct pending_request *p, GError **err) p->req_id = g_obex_move(p->session->obex, req->srcname, req->destname, async_cb, p, err); if (*err != NULL) - goto fail; + return (*err)->code; p->session->p = p; return 0; - -fail: - pending_request_free(p); - return (*err)->code; } guint obc_session_move(struct obc_session *session, const char *srcname, @@ -1341,15 +1325,11 @@ static int session_process_delete(struct pending_request *p, GError **err) p->req_id = g_obex_delete(p->session->obex, req->srcname, async_cb, p, err); if (*err != NULL) - goto fail; + return (*err)->code; p->session->p = p; return 0; - -fail: - pending_request_free(p); - return (*err)->code; } guint obc_session_delete(struct obc_session *session, const char *file, |