projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix issue reported on macos where the toolbar icons were not displayed.
[pspp]
/
src
/
output
/
measure.c
diff --git
a/src/output/measure.c
b/src/output/measure.c
index faeef969b09b247e4b4d3a7f468e35a2039bccbe..3376de8fbd05c4be2b134a1d73f2ddc859e701b2 100644
(file)
--- a/
src/output/measure.c
+++ b/
src/output/measure.c
@@
-30,7
+30,7
@@
#include "libpspp/str.h"
#include "gl/c-strcase.h"
#include "libpspp/str.h"
#include "gl/c-strcase.h"
-#include "
gl/error
.h"
+#include "
libpspp/message
.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-64,7
+64,7
@@
measure_dimension (const char *dimen)
return raw * factor;
syntax_error:
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;
}
return -1;
}
@@
-92,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)
/* 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
{
}
else
{
@@
-229,7
+229,7
@@
get_standard_paper_size (struct substring name, int *h, int *v)
assert (ok);
return ok;
}
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;
}
(int) ss_length (name), ss_data (name));
return false;
}
@@
-247,7
+247,7
@@
read_paper_conf (const char *file_name, int *h, int *v)
file = fopen (file_name, "r");
if (file == NULL)
{
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;
}
return false;
}
@@
-258,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))
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;
}
break;
}
@@
-275,7
+275,7
@@
read_paper_conf (const char *file_name, int *h, int *v)
fclose (file);
ds_destroy (&line);
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;
}
file_name);
return false;
}