summaryrefslogtreecommitdiffstats
path: root/lib/libc/db/recno/rec_delete.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libc/db/recno/rec_delete.c')
-rw-r--r--lib/libc/db/recno/rec_delete.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/libc/db/recno/rec_delete.c b/lib/libc/db/recno/rec_delete.c
index 35f56b9..a16593d 100644
--- a/lib/libc/db/recno/rec_delete.c
+++ b/lib/libc/db/recno/rec_delete.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1990, 1993
+ * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
@@ -35,7 +35,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rec_delete.c 8.4 (Berkeley) 2/21/94";
+static char sccsid[] = "@(#)rec_delete.c 8.7 (Berkeley) 7/14/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -88,13 +88,13 @@ __rec_delete(dbp, key, flags)
status = rec_rdelete(t, nrec);
break;
case R_CURSOR:
- if (!ISSET(t, B_SEQINIT))
+ if (!F_ISSET(&t->bt_cursor, CURS_INIT))
goto einval;
if (t->bt_nrecs == 0)
return (RET_SPECIAL);
- status = rec_rdelete(t, t->bt_rcursor - 1);
+ status = rec_rdelete(t, t->bt_cursor.rcursor - 1);
if (status == RET_SUCCESS)
- --t->bt_rcursor;
+ --t->bt_cursor.rcursor;
break;
default:
einval: errno = EINVAL;
@@ -102,7 +102,7 @@ einval: errno = EINVAL;
}
if (status == RET_SUCCESS)
- SET(t, B_MODIFIED | R_MODIFIED);
+ F_SET(t, B_MODIFIED | R_MODIFIED);
return (status);
}
@@ -154,11 +154,11 @@ int
__rec_dleaf(t, h, index)
BTREE *t;
PAGE *h;
- indx_t index;
+ u_int32_t index;
{
- register RLEAF *rl;
- register indx_t *ip, cnt, offset;
- register size_t nbytes;
+ RLEAF *rl;
+ indx_t *ip, cnt, offset;
+ u_int32_t nbytes;
char *from;
void *to;
OpenPOWER on IntegriCloud