X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdata-in.c;h=c5556a3c78694d0b939547d82ba0c812231be661;hb=3c5121dc68726f596565894f831e4fa311c99c64;hp=4ee0a4f2d216d76a9192fb5b2400d237f9860e04;hpb=c708736bdd0fea4b79f3ee4a10e00c3abb95d9e3;p=pspp-builds.git

diff --git a/src/data/data-in.c b/src/data/data-in.c
index 4ee0a4f2..c5556a3c 100644
--- a/src/data/data-in.c
+++ b/src/data/data-in.c
@@ -835,7 +835,8 @@ parse_trailer (struct data_in *i)
   if (!have_char (i))
     return true;
   
-  dls_error (i, _("Trailing garbage \"%s\" following date."), i->s);
+  dls_error (i, _("Trailing garbage \"%.*s\" following date."),
+             (int) (i->e - i->s), i->s);
   return false;
 }
 
@@ -1394,7 +1395,8 @@ data_in (struct data_in *i)
     }
   
   {
-    static bool (*const handlers[FMT_NUMBER_OF_FORMATS])(struct data_in *) = 
+    typedef bool (*handler_t) (struct data_in *);
+    static const handler_t handlers[FMT_NUMBER_OF_FORMATS] = 
       {
 	parse_numeric, parse_N, parse_numeric, parse_numeric,
 	parse_numeric, parse_numeric, parse_numeric,
@@ -1407,7 +1409,7 @@ data_in (struct data_in *i)
 	parse_WKDAY, parse_MONTH,
       };
 
-    bool (*handler)(struct data_in *);
+    handler_t handler;
     bool success;
 
     handler = handlers[i->format.type];