=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/rcs.h,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- src/usr.bin/cvs/rcs.h 2006/04/14 22:33:15 1.61 +++ src/usr.bin/cvs/rcs.h 2006/05/27 03:30:31 1.62 @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.h,v 1.61 2006/04/14 22:33:15 niallo Exp $ */ +/* $OpenBSD: rcs.h,v 1.62 2006/05/27 03:30:31 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * All rights reserved. @@ -133,7 +133,7 @@ #define RCS_ERR_PARSE 5 #define RCS_ERR_ERRNO 255 -/* used for cvs_checkout_rev */ +/* used for rcs_checkout_rev */ #define CHECKOUT_REV_CREATED 1 #define CHECKOUT_REV_MERGED 2 #define CHECKOUT_REV_REMOVED 3 @@ -190,6 +190,7 @@ typedef struct rcs_file { + int fd; char *rf_path; mode_t rf_mode; u_int rf_flags; @@ -209,11 +210,9 @@ void *rf_pdata; } RCSFILE; - extern int rcs_errno; - -RCSFILE *rcs_open(const char *, int, ...); +RCSFILE *rcs_open(const char *, int, int, ...); void rcs_close(RCSFILE *); const RCSNUM *rcs_head_get(RCSFILE *); int rcs_head_set(RCSFILE *, RCSNUM *); @@ -251,9 +250,8 @@ int rcs_state_check(const char *); RCSNUM *rcs_tag_resolve(RCSFILE *, const char *); const char *rcs_errstr(int); -int rcs_write(RCSFILE *); +void rcs_write(RCSFILE *); - int rcs_kflag_get(const char *); void rcs_kflag_usage(void); int rcs_kw_expand(RCSFILE *, u_char *, size_t, size_t *); @@ -272,12 +270,7 @@ /* rcstime.c */ void rcs_set_tz(char *, struct rcs_delta *, struct tm *); - extern char *timezone_flag; - -#if defined(RCSPROG) -extern char *rcs_tmpdir; -#endif extern int rcsnum_flags; #endif /* RCS_H */