projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master into gtk3.
[pspp]
/
src
/
output
/
measure.c
diff --git
a/src/output/measure.c
b/src/output/measure.c
index 14cd5dab9fdb56de6e263a4b4162a94df60dc4cb..3376de8fbd05c4be2b134a1d73f2ddc859e701b2 100644
(file)
--- a/
src/output/measure.c
+++ b/
src/output/measure.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* 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
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
@@
-18,6
+18,7
@@
#include "output/measure.h"
#include "output/measure.h"
+#include <gl/c-strtod.h>
#include <ctype.h>
#include <errno.h>
#if HAVE_LC_PAPER
#include <ctype.h>
#include <errno.h>
#if HAVE_LC_PAPER
@@
-28,7
+29,8
@@
#include "data/file-name.h"
#include "libpspp/str.h"
#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)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-50,7
+52,7
@@
measure_dimension (const char *dimen)
char *tail;
/* Number. */
char *tail;
/* Number. */
- raw = strtod (dimen, &tail);
+ raw =
c_
strtod (dimen, &tail);
if (raw < 0.0)
goto syntax_error;
if (raw < 0.0)
goto syntax_error;
@@
-62,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;
}
@@
-90,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
{
@@
-134,7
+136,7
@@
parse_unit (const char *unit)
unit += strspn (unit, CC_SPACES);
for (p = units; p < units + sizeof units / sizeof *units; p++)
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;
}
return p->factor;
return 0.0;
}
@@
-150,7
+152,7
@@
parse_paper_size (const char *size, int *h, int *v)
char *tail;
/* Width. */
char *tail;
/* Width. */
- raw_h = strtod (size, &tail);
+ raw_h =
c_
strtod (size, &tail);
if (raw_h <= 0.0)
return false;
if (raw_h <= 0.0)
return false;
@@
-158,7
+160,7
@@
parse_paper_size (const char *size, int *h, int *v)
tail += strspn (tail, CC_SPACES "x,");
/* Length. */
tail += strspn (tail, CC_SPACES "x,");
/* Length. */
- raw_v = strtod (tail, &tail);
+ raw_v =
c_
strtod (tail, &tail);
if (raw_v <= 0.0)
return false;
if (raw_v <= 0.0)
return false;
@@
-227,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;
}
@@
-245,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;
}
@@
-256,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;
}
@@
-273,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;
}