Minor change

* runcap.h (filecapture) <fc_linestart>: Rename to fc_cur.
All uses updated.
* runcap.c (filecapture_put): Use fc_cur as current pointer
and fc_level as the limit, for consistency.
(runcap_init): Initialize fc_cur.

1 files changed, 13 insertions, 11 deletions

diff --git a/runcap.c b/runcap.c
index 9dcefa1..9abc492 100644
--- a/runcap.c
+++ b/runcap.c
@@ -39,7 +39,7 @@ filecapture_alloc(struct filecapture *fc, size_t size)
 	fc->fc_leng = 0;
 	fc->fc_level = 0;
 	fc->fc_nlines = 0;
-	fc->fc_linestart = 0;
+	fc->fc_cur = 0;
 	fc->fc_tmpfd = -1;
 	fc->fc_fd = -1;
 	return 0;
@@ -65,7 +65,7 @@ filecapture_reset(struct filecapture *fc)
 	fc->fc_leng = 0;
 	fc->fc_level = 0;
 	fc->fc_nlines = 0;
-	fc->fc_linestart = 0;
+	fc->fc_cur = 0;
 
 	if (fc->fc_tmpfd >= 0) {
 		close(fc->fc_tmpfd);
@@ -126,7 +126,7 @@ filecapture_flush(struct filecapture *fc)
 	if (res)
 		return -1;
 	fc->fc_level = 0;
-	fc->fc_linestart = 0;
+	fc->fc_cur = 0;
 	return 0;
 }
 
@@ -154,10 +154,10 @@ filecapture_get(struct filecapture *fc, int *feof)
 	fc->fc_leng++;
 	if (c == '\n') {
 		if (fc->fc_linemon)
-			fc->fc_linemon(fc->fc_base + fc->fc_linestart,
-				       fc->fc_level - fc->fc_linestart,
+			fc->fc_linemon(fc->fc_base + fc->fc_cur,
+				       fc->fc_level - fc->fc_cur,
 				       fc->fc_monarg);
-		fc->fc_linestart = fc->fc_level;
+		fc->fc_cur = fc->fc_level;
 		fc->fc_nlines++;
 	}
 	return 0;
@@ -166,17 +166,17 @@ filecapture_get(struct filecapture *fc, int *feof)
 static int
 filecapture_put(struct filecapture *fc, int *feof)
 {
-	if (fc->fc_level < fc->fc_size) {
-		int n = write(fc->fc_fd, &fc->fc_base[fc->fc_level], 1);
+	if (fc->fc_cur < fc->fc_level) {
+		int n = write(fc->fc_fd, &fc->fc_base[fc->fc_cur], 1);
 		if (n == -1)
 			return -1;
 		if (n == 0) {
 			errno = ENOSPC;
 			return -1;
 		}
-		fc->fc_level++;
+		fc->fc_cur++;
 	}
-	*feof = fc->fc_level == fc->fc_size;
+	*feof = fc->fc_cur == fc->fc_level;
 	return 0;
 }
 
@@ -428,7 +428,9 @@ runcap_init(struct runcap *rc, int flags)
 			errno = EINVAL;
 			return -1;
 		}
-		rc->rc_cap[RUNCAP_STDIN].fc_level = 0;
+		rc->rc_cap[RUNCAP_STDIN].fc_level =
+			rc->rc_cap[RUNCAP_STDIN].fc_size;
+		rc->rc_cap[RUNCAP_STDIN].fc_cur = 0;
 	} else if (filecapture_init(&rc->rc_cap[RUNCAP_STDIN], 0))
 		return -1;