Only shuffle the scoop buffer if it's necessary to make space.

Rename rs_scoop_total_avail() to rs_scoop_avail() and make it a static inline
in stream.h

Remove rs_job_input_is_ending() from job.[hc] and replace it with a
rs_scoop_eof() static inline in stream.h.

In scoop.c make rs_scoop_input() only shuffle data to the start of the buffer
if necessary to free up space. Also make an assert() check more strict about
the data being within the buffer. Slightly tidy up rs_scoop_read_rest().

In delta.c make rs_delta_s_slack() neater by using the new rs_scoop_*()
functions.

1 files changed, 12 insertions, 1 deletions

diff --git a/src/stream.h b/src/stream.h
index be6e286..e5f6a44 100644
--- a/src/stream.h
+++ b/src/stream.h
@@ -75,6 +75,7 @@
  * nothing else can be done. */
 #ifndef STREAM_H
 #  define STREAM_H
+#  include "job.h"
 
 size_t rs_buffers_copy(rs_buffers_t *stream, size_t len);
 
@@ -88,6 +89,16 @@ void rs_scoop_advance(rs_job_t *job, size_t len);
 rs_result rs_scoop_readahead(rs_job_t *job, size_t len, void **ptr);
 rs_result rs_scoop_read(rs_job_t *job, size_t len, void **ptr);
 rs_result rs_scoop_read_rest(rs_job_t *job, size_t *len, void **ptr);
-size_t rs_scoop_total_avail(rs_job_t *job);
+
+static inline size_t rs_scoop_avail(rs_job_t *job)
+{
+    return job->scoop_avail + job->stream->avail_in;
+}
+
+/** Test if the scoop has reached eof. */
+static inline bool rs_scoop_eof(rs_job_t *job)
+{
+    return !rs_scoop_avail(job) && job->stream->eof_in;
+}
 
 #endif                          /* !STREAM_H */