From f0ff6f390a14b0da8466096c0886f5c4860b977f Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 19 Jun 2011 21:10:01 +0200 Subject: Use tevent_req_oom This fixes a few Coverity errors --- lib/tsocket/tsocket_helpers.c | 6 +++--- libcli/cldap/cldap.c | 4 ++-- source3/lib/fncall.c | 2 +- source3/lib/tldap.c | 4 ++-- source3/libsmb/async_smb.c | 2 +- source3/libsmb/cliconnect.c | 2 +- source3/libsmb/namequery.c | 8 ++++---- source3/torture/wbc_async.c | 2 +- source3/winbindd/wb_lookupsids.c | 6 +++--- source3/winbindd/winbindd_dual.c | 2 +- source3/winbindd/winbindd_dual_ndr.c | 2 +- source4/kdc/proxy.c | 2 +- source4/ldap_server/ldap_server.c | 2 +- source4/lib/messaging/messaging.c | 2 +- source4/libcli/wrepl/winsrepl.c | 4 ++-- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/tsocket/tsocket_helpers.c b/lib/tsocket/tsocket_helpers.c index 3a41a3efc3..db6b6148e9 100644 --- a/lib/tsocket/tsocket_helpers.c +++ b/lib/tsocket/tsocket_helpers.c @@ -73,7 +73,7 @@ struct tevent_req *tdgram_sendto_queue_send(TALLOC_CTX *mem_ctx, tdgram_sendto_queue_trigger, NULL); if (!ok) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); goto post; } @@ -346,7 +346,7 @@ struct tevent_req *tstream_readv_pdu_queue_send(TALLOC_CTX *mem_ctx, tstream_readv_pdu_queue_trigger, NULL); if (!ok) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); goto post; } @@ -453,7 +453,7 @@ struct tevent_req *tstream_writev_queue_send(TALLOC_CTX *mem_ctx, tstream_writev_queue_trigger, NULL); if (!ok) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); goto post; } diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c index 59c54eabea..a5a0e41598 100644 --- a/libcli/cldap/cldap.c +++ b/libcli/cldap/cldap.c @@ -631,7 +631,7 @@ struct tevent_req *cldap_search_send(TALLOC_CTX *mem_ctx, } if (!tevent_req_set_endtime(req, state->caller.cldap->event.ctx, end)) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); goto post; } @@ -680,7 +680,7 @@ static void cldap_search_state_queue_done(struct tevent_req *subreq) /* wait for incoming traffic */ if (!cldap_recvfrom_setup(state->caller.cldap)) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return; } diff --git a/source3/lib/fncall.c b/source3/lib/fncall.c index 4a013e9ee6..6e6b7c9250 100644 --- a/source3/lib/fncall.c +++ b/source3/lib/fncall.c @@ -266,7 +266,7 @@ struct tevent_req *fncall_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, return tevent_req_post(req, ev); } if (!fncall_set_pending(req, state->ctx, ev)) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return tevent_req_post(req, ev); } return req; diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c index c2f5b2ced7..8b04d00636 100644 --- a/source3/lib/tldap.c +++ b/source3/lib/tldap.c @@ -541,7 +541,7 @@ static void tldap_msg_sent(struct tevent_req *subreq) } if (!tldap_msg_set_pending(req)) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return; } } @@ -1703,7 +1703,7 @@ static void tldap_search_done(struct tevent_req *subreq) case TLDAP_RES_SEARCH_ENTRY: case TLDAP_RES_SEARCH_REFERENCE: if (!tldap_msg_set_pending(subreq)) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return; } tevent_req_notify_callback(req); diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c index 145e0aeb55..ee15caee7a 100644 --- a/source3/libsmb/async_smb.c +++ b/source3/libsmb/async_smb.c @@ -369,7 +369,7 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx, if (cli->timeout) { endtime = timeval_current_ofs_msec(cli->timeout); if (!tevent_req_set_endtime(result, ev, endtime)) { - tevent_req_nomem(NULL, result); + tevent_req_oom(result); } } return result; diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index a9a1847f1c..62e3a35a36 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -1365,7 +1365,7 @@ static void cli_sesssetup_blob_done(struct tevent_req *subreq) * More to send */ if (!cli_sesssetup_blob_next(state, &subreq)) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return; } tevent_req_set_callback(subreq, cli_sesssetup_blob_done, req); diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index 8d843745d3..dca740d3e6 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -1595,7 +1595,7 @@ static struct tevent_req *name_queries_send( if (!tevent_req_set_endtime( subreq, state->ev, timeval_current_ofs(0, state->timeout_msec * 1000))) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return tevent_req_post(req, ev); } tevent_req_set_callback(subreq, name_queries_done, req); @@ -1678,7 +1678,7 @@ static void name_queries_next(struct tevent_req *subreq) if (!tevent_req_set_endtime( subreq, state->ev, timeval_current_ofs(0, state->timeout_msec * 1000))) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return; } state->subreqs[state->num_sent] = subreq; @@ -1915,7 +1915,7 @@ static struct tevent_req *query_wins_list_send( } if (!tevent_req_set_endtime(subreq, state->ev, timeval_current_ofs(2, 0))) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return tevent_req_post(req, ev); } tevent_req_set_callback(subreq, query_wins_list_done, req); @@ -1962,7 +1962,7 @@ static void query_wins_list_done(struct tevent_req *subreq) } if (!tevent_req_set_endtime(subreq, state->ev, timeval_current_ofs(2, 0))) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return; } tevent_req_set_callback(subreq, query_wins_list_done, req); diff --git a/source3/torture/wbc_async.c b/source3/torture/wbc_async.c index 182474c216..9252b58bc9 100644 --- a/source3/torture/wbc_async.c +++ b/source3/torture/wbc_async.c @@ -551,7 +551,7 @@ struct tevent_req *wb_trans_send(TALLOC_CTX *mem_ctx, if (!tevent_queue_add(wb_ctx->queue, ev, req, wb_trans_trigger, NULL)) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return tevent_req_post(req, ev); } return req; diff --git a/source3/winbindd/wb_lookupsids.c b/source3/winbindd/wb_lookupsids.c index 92eee039ed..03b2ca9029 100644 --- a/source3/winbindd/wb_lookupsids.c +++ b/source3/winbindd/wb_lookupsids.c @@ -481,7 +481,7 @@ static void wb_lookupsids_done(struct tevent_req *subreq) &state->tmp_domains, &state->tmp_names.names[i], state->res_domains, state->res_names, res_sid_index)) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return; } } @@ -544,7 +544,7 @@ static void wb_lookupsids_single_done(struct tevent_req *subreq) &src_domains, &src_name, state->res_domains, state->res_names, res_sid_index)) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return; } state->single_sids_done += 1; @@ -619,7 +619,7 @@ static void wb_lookupsids_lookuprids_done(struct tevent_req *subreq) &src_domains, &src_name, state->res_domains, state->res_names, res_sid_index)) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return; } } diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c index 9f82737544..5bf90b1222 100644 --- a/source3/winbindd/winbindd_dual.c +++ b/source3/winbindd/winbindd_dual.c @@ -127,7 +127,7 @@ struct tevent_req *wb_child_request_send(TALLOC_CTX *mem_ctx, if (!tevent_queue_add(child->queue, ev, req, wb_child_request_trigger, NULL)) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return tevent_req_post(req, ev); } return req; diff --git a/source3/winbindd/winbindd_dual_ndr.c b/source3/winbindd/winbindd_dual_ndr.c index fb89c3f27f..f5f143f612 100644 --- a/source3/winbindd/winbindd_dual_ndr.c +++ b/source3/winbindd/winbindd_dual_ndr.c @@ -144,7 +144,7 @@ static void wbint_bh_raw_call_done(struct tevent_req *subreq) state->response->extra_data.data, state->response->length - sizeof(struct winbindd_response)); if (state->response->extra_data.data && !state->out_data.data) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return; } diff --git a/source4/kdc/proxy.c b/source4/kdc/proxy.c index 98db956f65..324bfb8e2e 100644 --- a/source4/kdc/proxy.c +++ b/source4/kdc/proxy.c @@ -556,7 +556,7 @@ static void kdc_tcp_proxy_read_pdu_done(struct tevent_req *subreq) */ state->out = data_blob_talloc(state, raw.data + 4, raw.length - 4); if (state->out.length != raw.length - 4) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return; } diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 2d45766b88..411be29440 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -708,7 +708,7 @@ static struct tevent_req *ldapsrv_process_call_send(TALLOC_CTX *mem_ctx, ok = tevent_queue_add(call_queue, ev, req, ldapsrv_process_call_trigger, NULL); if (!ok) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return tevent_req_post(req, ev); } diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index 13fc188155..484f22b2ee 100644 --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c @@ -1178,7 +1178,7 @@ static void irpc_bh_raw_call_incoming_handler(struct irpc_request *irpc, m->ndr->data + m->ndr->offset, m->ndr->data_size - m->ndr->offset); if ((m->ndr->data_size - m->ndr->offset) > 0 && !state->out_data.data) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return; } diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c index 72c040d3a1..c7f1ad07cb 100644 --- a/source4/libcli/wrepl/winsrepl.c +++ b/source4/libcli/wrepl/winsrepl.c @@ -201,7 +201,7 @@ struct tevent_req *wrepl_connect_send(TALLOC_CTX *mem_ctx, wrepl_connect_trigger, NULL); if (!ok) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return tevent_req_post(req, ev); } @@ -382,7 +382,7 @@ struct tevent_req *wrepl_request_send(TALLOC_CTX *mem_ctx, wrepl_request_trigger, NULL); if (!ok) { - tevent_req_nomem(NULL, req); + tevent_req_oom(req); return tevent_req_post(req, ev); } -- cgit