summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/rcs.c
diff options
context:
space:
mode:
authorRay Lai <ray@cvs.openbsd.org>2006-05-27 08:12:30 +0000
committerRay Lai <ray@cvs.openbsd.org>2006-05-27 08:12:30 +0000
commitd23e96a827be6ec46a6d87db28b3619d3d3ad491 (patch)
tree0b5cce40f6d1c649cb773cbcc0e000b0c26c04b9 /usr.bin/rcs/rcs.c
parentab39d19b3c9648032462ea5ae87d87ac97cb028f (diff)
Rename RCSFILE.fd to RCSFILE.rf_fd, plus minor spacing nits. No
binary change. OK xsa@
Diffstat (limited to 'usr.bin/rcs/rcs.c')
-rw-r--r--usr.bin/rcs/rcs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/rcs/rcs.c b/usr.bin/rcs/rcs.c
index cfeff4dc281..98c73aaac18 100644
--- a/usr.bin/rcs/rcs.c
+++ b/usr.bin/rcs/rcs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcs.c,v 1.9 2006/05/11 07:34:26 xsa Exp $ */
+/* $OpenBSD: rcs.c,v 1.10 2006/05/27 08:12:29 ray Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -262,7 +262,7 @@ rcs_open(const char *path, int fd, int flags, ...)
rfp->rf_path = xstrdup(path);
rfp->rf_flags = flags | RCS_SLOCK | RCS_SYNCED;
rfp->rf_mode = fmode;
- rfp->fd = fd;
+ rfp->rf_fd = fd;
TAILQ_INIT(&(rfp->rf_delta));
TAILQ_INIT(&(rfp->rf_access));
@@ -1720,7 +1720,7 @@ rcs_parse_init(RCSFILE *rfp)
pdp->rp_lines = 0;
pdp->rp_pttype = RCS_TOK_ERR;
- if ((pdp->rp_file = fdopen(rfp->fd, "r")) == NULL)
+ if ((pdp->rp_file = fdopen(rfp->rf_fd, "r")) == NULL)
err(1, "fopen: `%s'", rfp->rf_path);
pdp->rp_buf = xmalloc((size_t)RCS_BUFSIZE);