X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fmeasure.c;h=3376de8fbd05c4be2b134a1d73f2ddc859e701b2;hb=b3f647847a611237213102734f1cd2e9d2c3b5ab;hp=60894f1cc25f81b3b21ae862ee646e0ac1d3c0ac;hpb=fa1fffd5c789d9c7875fc3bdf556eaf017cf524e;p=pspp

diff --git a/src/output/measure.c b/src/output/measure.c
index 60894f1cc2..3376de8fbd 100644
--- a/src/output/measure.c
+++ b/src/output/measure.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,7 +29,8 @@
 #include "data/file-name.h"
 #include "libpspp/str.h"
 
-#include "gl/error.h"
+#include "gl/c-strcase.h"
+#include "libpspp/message.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -63,7 +64,7 @@ measure_dimension (const char *dimen)
   return raw * factor;
 
 syntax_error:
-  error (0, 0, _("`%s' is not a valid length."), dimen);
+  msg (ME, _("`%s' is not a valid length."), dimen);
   return -1;
 }
 
@@ -91,7 +92,7 @@ measure_paper (const char *size, int *h, int *v)
       /* Treat string that starts with digit as explicit size. */
       ok = parse_paper_size (size, h, v);
       if (!ok)
-        error (0, 0, _("syntax error in paper size `%s'"), size);
+        msg (ME, _("syntax error in paper size `%s'"), size);
     }
   else
     {
@@ -135,7 +136,7 @@ parse_unit (const char *unit)
 
   unit += strspn (unit, CC_SPACES);
   for (p = units; p < units + sizeof units / sizeof *units; p++)
-    if (!strcasecmp (unit, p->name))
+    if (!c_strcasecmp (unit, p->name))
       return p->factor;
   return 0.0;
 }
@@ -228,7 +229,7 @@ get_standard_paper_size (struct substring name, int *h, int *v)
         assert (ok);
         return ok;
       }
-  error (0, 0, _("unknown paper type `%.*s'"),
+  msg (ME, _("unknown paper type `%.*s'"),
          (int) ss_length (name), ss_data (name));
   return false;
 }
@@ -246,7 +247,7 @@ read_paper_conf (const char *file_name, int *h, int *v)
   file = fopen (file_name, "r");
   if (file == NULL)
     {
-      error (0, errno, _("error opening input file `%s'"), file_name);
+      msg_error (errno, _("error opening input file `%s'"), file_name);
       return false;
     }
 
@@ -257,7 +258,7 @@ read_paper_conf (const char *file_name, int *h, int *v)
       if (!ds_read_config_line (&line, &line_number, file))
 	{
 	  if (ferror (file))
-	    error (0, errno, _("error reading file `%s'"), file_name);
+	    msg_error (errno, _("error reading file `%s'"), file_name);
 	  break;
 	}
 
@@ -274,7 +275,7 @@ read_paper_conf (const char *file_name, int *h, int *v)
 
   fclose (file);
   ds_destroy (&line);
-  error (0, 0, _("paper size file `%s' does not state a paper size"),
+  msg (ME, _("paper size file `%s' does not state a paper size"),
          file_name);
   return false;
 }