From 4cd27328cc0718322ecd2c61608a4cb987acb9c5 Mon Sep 17 00:00:00 2001 From: joris Date: Tue, 8 Jul 2008 12:54:13 +0000 Subject: [PATCH] make these compile cleanly --- usr.bin/cvs/commit.c | 11 +++++++++-- usr.bin/cvs/server.c | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index 810cf4b2191..b164f2baad4 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.143 2008/06/15 04:38:52 tobias Exp $ */ +/* $OpenBSD: commit.c,v 1.144 2008/07/08 12:54:13 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink * Copyright (c) 2006 Xavier Santolaria @@ -480,6 +480,7 @@ cvs_commit_local(struct cvs_file *cf) nrev = RCS_HEAD_REV; crev = NULL; rrev = NULL; + d = NULL; if (cf->file_rcs != NULL && cf->file_rcs->rf_branch != NULL) { rcsnum_free(cf->file_rcs->rf_branch); @@ -704,12 +705,18 @@ cvs_commit_local(struct cvs_file *cf) case FILE_REMOVED: histtype = CVS_HISTORY_COMMIT_REMOVED; break; + default: + histtype = -1; + break; } if (crev != NULL) rcsnum_free(crev); - cvs_history_add(histtype, cf, NULL); + if (histtype != -1) + cvs_history_add(histtype, cf, NULL); + else + cvs_log(LP_NOTICE, "histtype was -1 for %s", cf->file_path); } static BUF * diff --git a/usr.bin/cvs/server.c b/usr.bin/cvs/server.c index d9955e83c8d..ec5d1904a6f 100644 --- a/usr.bin/cvs/server.c +++ b/usr.bin/cvs/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.91 2008/06/14 03:19:15 joris Exp $ */ +/* $OpenBSD: server.c,v 1.92 2008/07/08 12:54:13 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink * @@ -773,7 +773,7 @@ cvs_server_update_entry(const char *resp, struct cvs_file *cf) } void -cvs_server_set_sticky(char *dir, char *tag) +cvs_server_set_sticky(const char *dir, const char *tag) { char fpath[MAXPATHLEN]; -- 2.20.1