Consolidate quoting style in printed strings.

[pspp] / tests / dissect-sysfile.c

diff --git a/tests/dissect-sysfile.c b/tests/dissect-sysfile.c
index 4fc610a9972ba72a27fed40976d53958182ae65f..cbe1f3a0507fdd8c1de2dff0850ec70c33671b21 100644 (file)
--- a/tests/dissect-sysfile.c
+++ b/tests/dissect-sysfile.c
@@ -102,6 +102,7 @@ static void sys_error (struct sfm_reader *, const char *, ...)
      NO_RETURN;
 
 static void read_bytes (struct sfm_reader *, void *, size_t);
+static bool try_read_bytes (struct sfm_reader *, void *, size_t);
 static int read_int (struct sfm_reader *);
 static int64_t read_int64 (struct sfm_reader *);
 static double read_float (struct sfm_reader *);
@@ -126,7 +127,7 @@ main (int argc, char *argv[])
       r.file_name = argv[i];
       r.file = fopen (r.file_name, "rb");
       if (r.file == NULL)
-        error (EXIT_FAILURE, errno, "error opening \"%s\"", r.file_name);
+        error (EXIT_FAILURE, errno, "error opening `%s'", r.file_name);
       r.n_variable_records = 0;
       r.n_variables = 0;
       r.n_var_widths = 0;
@@ -697,7 +698,7 @@ read_mrsets (struct sfm_reader *r, size_t size, size_t count)
           if (!strcmp (number, "11"))
             label_from_var_label = true;
           else if (strcmp (number, "1"))
-            sys_warn (r, _("Unexpected label source value \"%s\" "
+            sys_warn (r, _("Unexpected label source value `%s' "
                            "following 'E' at offset %zu in MRSETS record"),
                       number, text_pos (text));
 
@@ -1079,6 +1080,7 @@ read_compressed_data (struct sfm_reader *r)
   printf ("\n%08llx: compressed data:\n", (long long int) ftello (r->file));
 
   opcode_idx = N_OPCODES;
+  opcode_ofs = 0;
   case_num = 0;
   for (case_num = 0; ; case_num++)
     {
@@ -1093,7 +1095,13 @@ read_compressed_data (struct sfm_reader *r)
           if (opcode_idx >= N_OPCODES)
             {
               opcode_ofs = ftello (r->file);
-              read_bytes (r, opcodes, 8);
+              if (i == 0)
+                {
+                  if (!try_read_bytes (r, opcodes, 8))
+                    return;
+                }
+              else
+                read_bytes (r, opcodes, 8);
               opcode_idx = 0;
             }
           opcode = opcodes[opcode_idx];
@@ -1360,6 +1368,16 @@ read_bytes (struct sfm_reader *r, void *buf, size_t byte_cnt)
   read_bytes_internal (r, false, buf, byte_cnt);
 }
 
+/* Reads BYTE_CNT bytes into BUF.
+   Returns true if exactly BYTE_CNT bytes are successfully read.
+   Returns false if an immediate end-of-file is encountered.
+   Aborts if an I/O error or a partial read occurs. */
+static bool
+try_read_bytes (struct sfm_reader *r, void *buf, size_t byte_cnt)
+{
+  return read_bytes_internal (r, true, buf, byte_cnt);
+}
+
 /* Reads a 32-bit signed integer from R and returns its value in
    host format. */
 static int