From 027b6812eed77582a73b529bcf090d2ba8008730 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Tue, 28 Dec 2010 15:59:48 +0000 Subject: [PATCH] ITS#6686 Fix last commit (declaration after code) --- servers/slapd/overlays/sssvlv.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c index 1fa6e7eb1c..4d0bc91298 100644 --- a/servers/slapd/overlays/sssvlv.c +++ b/servers/slapd/overlays/sssvlv.c @@ -164,11 +164,13 @@ static int node_cmp( const void* val1, const void* val2 ) { sort_node *sn1 = (sort_node *)val1; sort_node *sn2 = (sort_node *)val2; - assert( sort_conns[sn1->sn_conn] && sort_conns[sn1->sn_conn][sn1->sn_session] - && sort_conns[sn1->sn_conn][sn1->sn_session]->so_ctrl ); - sort_ctrl *sc = sort_conns[sn1->sn_conn][sn1->sn_session]->so_ctrl; + sort_ctrl *sc; MatchingRule *mr; int i, cmp = 0; + assert( sort_conns[sn1->sn_conn] + && sort_conns[sn1->sn_conn][sn1->sn_session] + && sort_conns[sn1->sn_conn][sn1->sn_session]->so_ctrl ); + sc = sort_conns[sn1->sn_conn][sn1->sn_session]->so_ctrl; for ( i=0; cmp == 0 && isc_nkeys; i++ ) { if ( BER_BVISNULL( &sn1->sn_vals[i] )) {