diff options
| author | jbj <devnull@localhost> | 2002-09-19 21:06:40 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2002-09-19 21:06:40 +0000 |
| commit | 2376437b8faec79eb8ccaa874f271d4ee69d276f (patch) | |
| tree | fc29754122bfce5816757e4c77f781c52a4d75c4 /db/rep/rep_util.c | |
| parent | 4a15060bcbf38c550f7dcc86ceff277854f9eecf (diff) | |
| download | rpm-2376437b8faec79eb8ccaa874f271d4ee69d276f.tar.gz rpm-2376437b8faec79eb8ccaa874f271d4ee69d276f.tar.bz2 rpm-2376437b8faec79eb8ccaa874f271d4ee69d276f.zip | |
Conflict resolved.
CVS patchset: 5722
CVS date: 2002/09/19 21:06:40
Diffstat (limited to 'db/rep/rep_util.c')
| -rw-r--r-- | db/rep/rep_util.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/db/rep/rep_util.c b/db/rep/rep_util.c index e561f58d2..880b13c09 100644 --- a/db/rep/rep_util.c +++ b/db/rep/rep_util.c @@ -8,7 +8,7 @@ #include "db_config.h" #ifndef lint -static const char revid[] = "Id: rep_util.c,v 1.50 2002/08/06 04:50:36 bostic Exp "; +static const char revid[] = "Id: rep_util.c,v 1.51 2002/09/05 02:30:00 margo Exp "; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -121,7 +121,7 @@ __rep_send_message(dbenv, eid, rtype, lsnp, dbtp, flags) send_flags = (LF_ISSET(DB_PERMANENT) ? DB_REP_PERMANENT : 0); #if 0 - __rep_print_message(eid, &cntrl, "rep_send_message"); + __rep_print_message(dbenv, eid, &cntrl, "rep_send_message"); #endif #ifdef REP_DIAGNOSTIC if (rtype == REP_LOG) @@ -776,10 +776,11 @@ err: if (LOCK_ISSET(lk) && (t_ret = __LPUT(dbc, lk)) != 0 && ret == 0) #if 0 /* - * PUBLIC: void __rep_print_message __P((int, REP_CONTROL *, char *)); + * PUBLIC: void __rep_print_message __P((DB_ENV *, int, REP_CONTROL *, char *)); */ void -__rep_print_message(eid, rp, str) +__rep_print_message(dbenv, eid, rp, str) + DB_ENV *dbenv; int eid; REP_CONTROL *rp; char *str; @@ -859,7 +860,8 @@ __rep_print_message(eid, rp, str) type = "NOTYPE"; break; } - printf("%s: eid %d, type %s, LSN [%u][%u]\n", str, eid, - type, rp->lsn.file, rp->lsn.offset); + printf("%s %s: gen = %d eid %d, type %s, LSN [%u][%u]\n", + dbenv->db_home, str, rp->gen, eid, type, rp->lsn.file, + rp->lsn.offset); } #endif |