upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-25 17:19:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#7231 simplify prev commit

Browse source
This commit is contained in:
Howard Chu 2012-04-07 07:57:39 -07:00
parent 494c6fa37f
commit 8bf047c8cb
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
servers/slapd/back-bdb/idl.c
View file

@ -1357,6 +1357,10 @@ int bdb_idl_append( ID *a, ID *b )
return 0;
}
if ( b[0] == 1 ) {
return bdb_idl_append_one( a, BDB_IDL_FIRST( b ));
}
ida = BDB_IDL_LAST( a );
idb = BDB_IDL_LAST( b );
if ( BDB_IDL_IS_RANGE( a ) || BDB_IDL_IS_RANGE(b) ||
@ -1367,7 +1371,7 @@ int bdb_idl_append( ID *a, ID *b )
return 0;
}
if ( b[0] > 1 && ida > idb ) {
if ( ida > idb ) {
swap = idb;
a[a[0]] = idb;
b[b[0]] = ida;
@ -1377,17 +1381,12 @@ int bdb_idl_append( ID *a, ID *b )
tmp = a[1];
a[1] = b[1];
} else {
if (b[1] < ida) {
tmp = a[a[0]];
a[a[0]] = b[1];
} else {
tmp = b[1];
}
tmp = b[1];
}
a[0]++;
a[a[0]] = tmp;
if ( b[0] > 1 ) {
{
int i = b[0] - 1;
AC_MEMCPY(a+a[0]+1, b+2, i * sizeof(ID));
a[0] += i;