diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2008-02-09 20:04:01 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2008-02-09 20:04:01 +0000 |
| commit | 8c24de380c7a47ce74567986a655e7fee381faee (patch) | |
| tree | 2f0105446f420d2847ad1ae397acd324585ab699 /usr.bin/cvs/update.c | |
| parent | 06719c8f8958c753fac5525b73b73c502d342480 (diff) | |
Introduce cvs_ent_line_str() - formats CVS/Entries lines.
OK tobias@.
Diffstat (limited to 'usr.bin/cvs/update.c')
| -rw-r--r-- | usr.bin/cvs/update.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index 02a2f6d1eb5..d24bac354af 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.128 2008/02/09 17:52:32 joris Exp $ */ +/* $OpenBSD: update.c,v 1.129 2008/02/09 20:04:00 xsa Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -473,9 +473,9 @@ update_clear_conflict(struct cvs_file *cf) cf->file_ent->ce_tag); entry = xmalloc(CVS_ENT_MAXLINELEN); - (void)xsnprintf(entry, CVS_ENT_MAXLINELEN, "/%s/%s/%s/%s/%s", - cf->file_name, revbuf, timebuf, cf->file_ent->ce_opts ? : "", - sticky); + cvs_ent_line_str(cf->file_name, revbuf, timebuf, + cf->file_ent->ce_opts ? : "", sticky, 0, 0, + entry, CVS_ENT_MAXLINELEN); entlist = cvs_ent_open(cf->file_wd); cvs_ent_add(entlist, entry); |