Add missing lprintf() calls related to keyword expansion mode for RCS updates.

This requires decoding the keyword expansion mode in the updater rather than in
the rcsfile API, but that is more appropriate anyways. To that aim, create a
new function rcsfile_setexpand() that accepts the already decoded keyword
expansion mode, and remove the decoding/setting code out of rcsfile_setval().
Also remove a redundant lprintf() call in an error code path.

Author: mux

rcsfile.c

@@ -211,7 +211,6 @@ rcsfile_frompath(const char *path, const char *name, const char *cvsroot,
 
 	error = rcsparse(rf, path, ro);
 	if (error) {
-		lprintf(-1, "Error parsing \"%s\"\n", name);
 		rcsfile_free(rf);
 		return (NULL);
 	}
@@ -965,9 +964,6 @@ rcsfile_setval(struct rcsfile *rf, int field, char *val, size_t len)
 		rf->comment = val;
 		rf->commentlen = len;
 		break;
-	case RCSFILE_EXPAND:
-		rf->expand = keyword_decode_expand(val);
-		break;
 	case RCSFILE_DESC:
 		if (rf->desc != NULL)
 			free(rf->desc);
@@ -980,6 +976,13 @@ rcsfile_setval(struct rcsfile *rf, int field, char *val, size_t len)
 	}
 }
 
+void
+rcsfile_setexpand(struct rcsfile *rf, int expand)
+{
+
+	rf->expand = expand;
+}
+
 void
 rcsfile_setstrict(struct rcsfile *rf)
 {

rcsfile.h

@@ -32,8 +32,7 @@
 #define RCSFILE_HEAD	0
 #define RCSFILE_BRANCH	1
 #define RCSFILE_COMMENT	2
-#define RCSFILE_EXPAND	3
-#define RCSFILE_DESC	4
+#define RCSFILE_DESC	3
 
 struct rcsfile;
 struct delta;
@@ -56,6 +55,7 @@ void		 rcsfile_deletetag(struct rcsfile *, char *, char *);
 struct delta	*rcsfile_getdelta(struct rcsfile *, char *);
 void		 rcsfile_setval(struct rcsfile *, int, char *, size_t);
 void		 rcsfile_setstrict(struct rcsfile *);
+void		 rcsfile_setexpand(struct rcsfile *, int);
 
 /* Functions used for operating on RCS deltas. */
 struct delta	*rcsfile_addelta(struct rcsfile *, char *, char *, char *,

updater.c

@@ -1550,9 +1550,9 @@ updater_rcsedit(struct updater *up, struct file_update *fup, char *name,
 	struct rcsfile *rf;
 	struct fattr *oldfattr;
 	char md5[MD5_DIGEST_SIZE];
-	char *branch, *cmd, *expand, *line, *path, *revnum, *tag, *temppath;
+	char *branch, *cmd, *expandtxt, *line, *path, *revnum, *tag, *temppath;
 	char *diffbase, *revdate, *author;
-	int error;
+	int error, expand;
 
 	coll = fup->coll;
 	sr = &fup->srbuf;
@@ -1650,12 +1650,19 @@ updater_rcsedit(struct updater *up, struct file_update *fup, char *name,
 				rcsfile_deleterev(rf, revnum);
 				break;
 			case 'E':
-				expand = proto_get_ascii(&line);
-				if (expand == NULL || line != NULL)
+				expandtxt = proto_get_ascii(&line);
+				if (expandtxt == NULL || line != NULL)
 					return (UPDATER_ERR_PROTO);
+				expand = keyword_decode_expand(expandtxt);
+				if (expand == EXPAND_DEFAULT)
+					lprintf(2, "  Set keyword expansion "
+					    "to default\n");
+				else
+					lprintf(2, "  Set keyword expansion "
+					    "to %s\n", expandtxt);
 				UPDATER_OPENRCS(rf, up, path, name,
 				    coll->co_cvsroot, coll->co_tag);
-				rcsfile_setval(rf, RCSFILE_EXPAND, expand, 0);
+				rcsfile_setexpand(rf, expand);
 				break;
 			case 'T':
 				tag = proto_get_ascii(&line);