From 866d7554e24b54e2178b55634e4d7cee2320e135 Mon Sep 17 00:00:00 2001
From: skimo <skimo>
Date: Fri, 8 Mar 2002 20:58:12 +0000
Subject: [PATCH] s/PTR/POINTER/ + regen

---
 common/vi.src    |  2 +-
 common/vi_auto.c | 20 +++++++++++++++++---
 common/vi_auto.h |  1 +
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/common/vi.src b/common/vi.src
index 7bfb9b43..a05cb816 100644
--- a/common/vi.src
+++ b/common/vi.src
@@ -28,7 +28,7 @@ ARG	cno		size_t		d
 END
 
 BEGIN	mark		202
-PTR	lmp		LMARK
+POINTER	lmp		LMARK *		lu
 END
 
 BEGIN	change		203
diff --git a/common/vi_auto.c b/common/vi_auto.c
index 0f1c8027..528fdca9 100644
--- a/common/vi_auto.c
+++ b/common/vi_auto.c
@@ -376,14 +376,17 @@ __vi_cursor_read(dbenv, recbuf, argpp)
 }
 
 /*
- * PUBLIC: int __vi_mark_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t));
+ * PUBLIC: int __vi_mark_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t,
+ * PUBLIC:      LMARK *));
  */
 int
-__vi_mark_log(dbenv, txnid, ret_lsnp, flags)
+__vi_mark_log(dbenv, txnid, ret_lsnp, flags,
+	lmp)
 	DB_ENV *dbenv;
 	DB_TXN *txnid;
 	DB_LSN *ret_lsnp;
 	u_int32_t flags;
+	LMARK * lmp;
 {
 	DBT logrec;
 	DB_LSN *lsnp, null_lsn;
@@ -402,7 +405,8 @@ __vi_mark_log(dbenv, txnid, ret_lsnp, flags)
 		lsnp = &null_lsn;
 	} else
 		lsnp = &txnid->last_lsn;
-	logrec.size = sizeof(rectype) + sizeof(txn_num) + sizeof(DB_LSN);
+	logrec.size = sizeof(rectype) + sizeof(txn_num) + sizeof(DB_LSN)
+	    + sizeof(*lmp);
 	if ((ret = __os_malloc(dbenv, logrec.size, &logrec.data)) != 0)
 		return (ret);
 
@@ -417,6 +421,12 @@ __vi_mark_log(dbenv, txnid, ret_lsnp, flags)
 	memcpy(bp, lsnp, sizeof(DB_LSN));
 	bp += sizeof(DB_LSN);
 
+	if (lmp != NULL)
+		memcpy(bp, lmp, sizeof(*lmp));
+	else
+		memset(bp, 0, sizeof(*lmp));
+	bp += sizeof(*lmp);
+
 	DB_ASSERT((u_int32_t)(bp - (u_int8_t *)logrec.data) == logrec.size);
 	ret = dbenv->log_put(dbenv, ret_lsnp, (DBT *)&logrec, flags);
 	if (txnid != NULL && ret == 0)
@@ -491,6 +501,7 @@ __vi_mark_print(dbenv, dbtp, lsnp, notused2, notused3)
 	    (u_long)argp->txnid->txnid,
 	    (u_long)argp->prev_lsn.file,
 	    (u_long)argp->prev_lsn.offset);
+	(void)printf("\tlmp: %lu\n", (u_long)argp->lmp);
 	(void)printf("\n");
 	__os_free(dbenv, argp, 0);
 	return (0);
@@ -525,6 +536,9 @@ __vi_mark_read(dbenv, recbuf, argpp)
 	memcpy(&argp->prev_lsn, bp, sizeof(DB_LSN));
 	bp += sizeof(DB_LSN);
 
+	memcpy(&argp->lmp, bp,  sizeof(argp->lmp));
+	bp += sizeof(argp->lmp);
+
 	*argpp = argp;
 	return (0);
 }
diff --git a/common/vi_auto.h b/common/vi_auto.h
index 890be68c..b766a989 100644
--- a/common/vi_auto.h
+++ b/common/vi_auto.h
@@ -25,6 +25,7 @@ typedef struct _vi_mark_args {
 	u_int32_t type;
 	DB_TXN *txnid;
 	DB_LSN prev_lsn;
+	LMARK	lmp;
 } __vi_mark_args;
 
 #define	DB_vi_change	203
-- 
2.11.4.GIT