From 15aa7c472a1674cd76f37c09a81e9ee8b1187b1a Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Fri, 31 Dec 2010 14:08:34 +0000 Subject: [PATCH] noop commit: cleanup 0 -> REP_RESULT in SlapReply --- servers/slapd/back-ldap/chain.c | 2 +- servers/slapd/back-meta/conn.c | 3 +-- servers/slapd/back-monitor/init.c | 2 +- servers/slapd/back-sql/delete.c | 2 +- servers/slapd/back-sql/search.c | 2 +- servers/slapd/syncrepl.c | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/servers/slapd/back-ldap/chain.c b/servers/slapd/back-ldap/chain.c index 2334c11052..55d429f474 100644 --- a/servers/slapd/back-ldap/chain.c +++ b/servers/slapd/back-ldap/chain.c @@ -682,7 +682,7 @@ ldap_chain_search( * to be set once for all (correct?) */ li.li_bvuri = bvuri; for ( ; !BER_BVISNULL( &ref[0] ); ref++ ) { - SlapReply rs2 = { 0 }; + SlapReply rs2 = { REP_RESULT }; LDAPURLDesc *srv; req_search_s save_oq_search = op->oq_search, tmp_oq_search = { 0 }; diff --git a/servers/slapd/back-meta/conn.c b/servers/slapd/back-meta/conn.c index 7d7cc92507..46f31a8e57 100644 --- a/servers/slapd/back-meta/conn.c +++ b/servers/slapd/back-meta/conn.c @@ -908,7 +908,7 @@ meta_back_get_candidate( } else if ( candidate == META_TARGET_MULTIPLE ) { Operation op2 = *op; - SlapReply rs2 = { 0 }; + SlapReply rs2 = { REP_RESULT }; slap_callback cb2 = { 0 }; int rc; @@ -1891,4 +1891,3 @@ meta_back_quarantine( done:; ldap_pvt_thread_mutex_unlock( &mt->mt_quarantine_mutex ); } - diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c index 1648cbe1bb..ffe2d721c6 100644 --- a/servers/slapd/back-monitor/init.c +++ b/servers/slapd/back-monitor/init.c @@ -830,7 +830,7 @@ monitor_search2ndn( OperationBuffer opbuf; Operation *op; void *thrctx; - SlapReply rs = { 0 }; + SlapReply rs = { REP_RESULT }; slap_callback cb = { NULL, monitor_search2ndn_cb, NULL, NULL }; int rc; diff --git a/servers/slapd/back-sql/delete.c b/servers/slapd/back-sql/delete.c index ef66538f76..84ac381d03 100644 --- a/servers/slapd/back-sql/delete.c +++ b/servers/slapd/back-sql/delete.c @@ -334,7 +334,7 @@ backsql_tree_delete( { Operation op2 = *op; slap_callback sc = { 0 }; - SlapReply rs2 = { 0 }; + SlapReply rs2 = { REP_RESULT }; backsql_tree_delete_t btd = { 0 }; int rc; diff --git a/servers/slapd/back-sql/search.c b/servers/slapd/back-sql/search.c index 8ab839d177..09569b89a2 100644 --- a/servers/slapd/back-sql/search.c +++ b/servers/slapd/back-sql/search.c @@ -2513,7 +2513,7 @@ send_results:; #ifdef BACKSQL_SYNCPROV if ( op->o_sync ) { Operation op2 = *op; - SlapReply rs2 = { 0 }; + SlapReply rs2 = { REP_RESULT }; Entry *e = entry_alloc(); slap_callback cb = { 0 }; diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index 69bd6b5cb9..9760783c11 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -2423,7 +2423,7 @@ retry_add:; case LDAP_ALREADY_EXISTS: if ( retry ) { Operation op2 = *op; - SlapReply rs2 = { 0 }; + SlapReply rs2 = { REP_RESULT }; slap_callback cb2 = { 0 }; op2.o_bd = be; -- 2.39.5