diff options
| author | Sean Bright <sean@malleable.com> | 2008-08-10 19:35:50 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-08-10 19:35:50 +0000 |
| commit | b69c8e6ab5b5d20a964d67e93cda8dc07da61fa4 (patch) | |
| tree | b4d1b3f66cf87177cb1c8a8ee596b6a9458f8f6c /main/db1-ast/recno/rec_delete.c | |
| parent | 3ffb39833b25a02108214d7584733bc6b9c334df (diff) | |
Another big chunk of changes from the RSW branch. Bunch of stuff from main/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/db1-ast/recno/rec_delete.c')
| -rw-r--r-- | main/db1-ast/recno/rec_delete.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/db1-ast/recno/rec_delete.c b/main/db1-ast/recno/rec_delete.c index fc2047226..f40b5caed 100644 --- a/main/db1-ast/recno/rec_delete.c +++ b/main/db1-ast/recno/rec_delete.c @@ -151,10 +151,10 @@ rec_rdelete(t, nrec) * RET_SUCCESS, RET_ERROR. */ int -__rec_dleaf(t, h, index) +__rec_dleaf(t, h, idx) BTREE *t; PAGE *h; - u_int32_t index; + u_int32_t idx; { RLEAF *rl; indx_t *ip, cnt, offset; @@ -172,7 +172,7 @@ __rec_dleaf(t, h, index) * down, overwriting the deleted record and its index. If the record * uses overflow pages, make them available for reuse. */ - to = rl = GETRLEAF(h, index); + to = rl = GETRLEAF(h, idx); if (rl->flags & P_BIGDATA && __ovfl_delete(t, rl->bytes) == RET_ERROR) return (RET_ERROR); nbytes = NRLEAF(rl); @@ -185,8 +185,8 @@ __rec_dleaf(t, h, index) memmove(from + nbytes, from, (char *)to - from); h->upper += nbytes; - offset = h->linp[index]; - for (cnt = &h->linp[index] - (ip = &h->linp[0]); cnt--; ++ip) + offset = h->linp[idx]; + for (cnt = &h->linp[idx] - (ip = &h->linp[0]); cnt--; ++ip) if (ip[0] < offset) ip[0] += nbytes; for (cnt = &h->linp[NEXTINDEX(h)] - ip; --cnt; ++ip) |