upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 16:49:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#7191 fix typo, more alignment tweaks

Browse source
This commit is contained in:
Howard Chu 2012-03-08 21:39:31 -08:00
parent cfa8dd6884
commit 47e57a9c8f
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servers/slapd/back-mdb/back-mdb.h
View file

@ -170,6 +170,8 @@ typedef struct AttrList {
#if defined(__i386) || defined(__x86_64)
#define MISALIGNED_OK 1
#else
#define ALIGNER (sizeof(size_t)-1)
#endif
typedef struct IndexRbody {

8
servers/slapd/back-mdb/idl.c
View file

@ -414,7 +414,7 @@ mdb_idl_insert_keys(
assert( id != NOID );
#ifndef MISALIGNED_OK
if (keys[0].bv_len & 0x03)
if (keys[0].bv_len & ALIGNER)
kbuf[1] = 0;
#endif
for ( k=0; keys[k].bv_val; k++ ) {
@ -422,7 +422,7 @@ mdb_idl_insert_keys(
* exists and if it's a range.
*/
#ifndef MISALIGNED_OK
if (keys[k].bv_len & 0x03) {
if (keys[k].bv_len & ALIGNER) {
key.mv_size = sizeof(kbuf);
key.mv_data = kbuf;
memcpy(key.mv_data, keys[k].bv_val, keys[k].bv_len);
@ -563,7 +563,7 @@ mdb_idl_delete_keys(
assert( id != NOID );
#ifndef MISALIGNED_OK
if (keys[0].bv_len & 0x03)
if (keys[0].bv_len & ALIGNER)
kbuf[1] = 0;
#endif
for ( k=0; keys[k].bv_val; k++) {
@ -571,7 +571,7 @@ mdb_idl_delete_keys(
* exists and if it's a range.
*/
#ifndef MISALIGNED_OK
if (keys[k].bv_len & 0x03) {
if (keys[k].bv_len & ALIGNER) {
key.mv_size = sizeof(kbuf);
key.mv_data = kbuf;
memcpy(key.mv_data, keys[k].bv_val, keys[k].bv_len);

4
servers/slapd/back-mdb/key.c
View file

@ -39,14 +39,14 @@ mdb_key_read(
{
int rc;
MDB_val key;
#ifndef MSIALIGNED_OK
#ifndef MISALIGNED_OK
int kbuf[2];
#endif
Debug( LDAP_DEBUG_TRACE, "=> key_read\n", 0, 0, 0 );
#ifndef MISALIGNED_OK
if (k->bv_len & 0x03) {
if (k->bv_len & ALIGNER) {
key.mv_size = sizeof(kbuf);
key.mv_data = kbuf;
kbuf[1] = 0;