From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 15 Aug 2024 06:05:33 +0000 (-0700)
Subject: Fix minor diagnostic discrepancies in incrementals
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6bc4c4bf96704fe3c016865fb71d9cc79c458c86;p=thirdparty%2Ftar.git

Fix minor diagnostic discrepancies in incrementals

* src/incremen.c (read_directory_file, get_gnu_dumpdir):
Be more consistent about fatal errors.
---

diff --git a/src/incremen.c b/src/incremen.c
index 41dd0d86..0654e155 100644
--- a/src/incremen.c
+++ b/src/incremen.c
@@ -1349,16 +1349,17 @@ read_directory_file (void)
 	{
 	  ebuf = buf + sizeof PACKAGE_NAME - 1;
 	  if (*ebuf++ != '-')
-	    ERROR((1, 0, _("Bad incremental file format")));
+	    FATAL_ERROR ((0, 0, _("Bad incremental file format")));
 	  for (; *ebuf != '-'; ebuf++)
 	    if (!*ebuf)
-	      ERROR((1, 0, _("Bad incremental file format")));
+	      FATAL_ERROR ((0, 0, _("Bad incremental file format")));
 
 	  ebuf++;
 	  if (! ('0' <= *ebuf && *ebuf <= '0' + TAR_INCREMENTAL_VERSION
 		 && !c_isdigit (ebuf[1])))
-	    ERROR ((1, 0, _("Unsupported incremental format version: %s"),
-		    ebuf));
+	    FATAL_ERROR ((0, 0,
+			  _("Unsupported incremental format version: %s"),
+			  ebuf));
 	  incremental_version = *ebuf - '0';
 	}
       else
@@ -1482,7 +1483,7 @@ get_gnu_dumpdir (struct tar_stat_info *stat_info)
       mv_size_left (size);
       data_block = find_next_block ();
       if (!data_block)
-	ERROR ((1, 0, _("Unexpected EOF in archive")));
+	FATAL_ERROR ((0, 0, _("Unexpected EOF in archive")));
       copied = available_space_after (data_block);
       if (copied > size)
 	copied = size;