X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbuffer.c;h=c022971562240e629b415092c709f46f548e8a8c;hb=745832a280f635b26d67e2cb8d8882ac0432e5a0;hp=75b4487a8ef2ef5c3064749b71b042ce8e23ca60;hpb=c30a794679bec183fd543ffdb66a6262837ab11d;p=chaz%2Ftar diff --git a/src/buffer.c b/src/buffer.c index 75b4487..c022971 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -74,9 +74,6 @@ static int read_error_count; /* Have we hit EOF yet? */ static bool hit_eof; -/* Checkpointing counter */ -static unsigned checkpoint; - static bool read_full_records = false; /* We're reading, but we just read the last block and it's time to update. @@ -591,43 +588,13 @@ _open_archive (enum access_mode wanted_access) } } -static void -do_checkpoint (bool do_write) -{ - if (checkpoint_option && !(++checkpoint % checkpoint_option)) - { - switch (checkpoint_style) - { - case checkpoint_dot: - fputc ('.', stdlis); - fflush (stdlis); - break; - - case checkpoint_text: - if (do_write) - /* TRANSLATORS: This is a ``checkpoint of write operation'', - *not* ``Writing a checkpoint''. - E.g. in Spanish ``Punto de comprobaci@'on de escritura'', - *not* ``Escribiendo un punto de comprobaci@'on'' */ - WARN ((0, 0, _("Write checkpoint %u"), checkpoint)); - else - /* TRANSLATORS: This is a ``checkpoint of read operation'', - *not* ``Reading a checkpoint''. - E.g. in Spanish ``Punto de comprobaci@'on de lectura'', - *not* ``Leyendo un punto de comprobaci@'on'' */ - WARN ((0, 0, _("Read checkpoint %u"), checkpoint)); - break; - } - } -} - /* Perform a write to flush the buffer. */ ssize_t _flush_write (void) { ssize_t status; - do_checkpoint (true); + checkpoint_run (true); if (tape_length_option && tape_length_option <= bytes_written) { errno = ENOSPC; @@ -637,7 +604,7 @@ _flush_write (void) status = record_size; else status = sys_write_archive_buffer (); - + return status; } @@ -1466,7 +1433,7 @@ simple_flush_read (void) { size_t status; /* result from system call */ - do_checkpoint (false); + checkpoint_run (false); /* Clear the count of errors. This only applies to a single call to flush_read. */ @@ -1525,7 +1492,7 @@ _gnu_flush_read (void) { size_t status; /* result from system call */ - do_checkpoint (false); + checkpoint_run (false); /* Clear the count of errors. This only applies to a single call to flush_read. */