projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup
[pspp]
/
src
/
language
/
tests
/
paper-size.c
diff --git
a/src/language/tests/paper-size.c
b/src/language/tests/paper-size.c
index 5aea2c334f34f5157a7dbcd77d4fa0f4a478f6b7..bccc60f7945bdbc3d5e7de82e02b886286145187 100644
(file)
--- a/
src/language/tests/paper-size.c
+++ b/
src/language/tests/paper-size.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007
, 2010, 2011
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,31
+18,29
@@
#include <stdio.h>
#include <stdio.h>
-#include
<language/command.h>
-#include
<language/lexer/lexer.h>
-#include
<libpspp/assertion.h>
-#include
<libpspp/string-map.h>
-#include
<output/measure.h>
+#include
"language/command.h"
+#include
"language/lexer/lexer.h"
+#include
"libpspp/assertion.h"
+#include
"libpspp/string-map.h"
+#include
"output/measure.h"
/* Executes the DEBUG PAPER SIZE command. */
int
cmd_debug_paper_size (struct lexer *lexer, struct dataset *ds UNUSED)
{
const char *paper_size;
/* Executes the DEBUG PAPER SIZE command. */
int
cmd_debug_paper_size (struct lexer *lexer, struct dataset *ds UNUSED)
{
const char *paper_size;
-
int
h, v;
+
double
h, v;
if (!lex_force_string (lexer))
return CMD_FAILURE;
if (!lex_force_string (lexer))
return CMD_FAILURE;
- paper_size =
ds_cstr (lex_tokstr (lexer)
);
+ paper_size =
lex_tokcstr (lexer
);
printf ("\"%s\" => ", paper_size);
if (measure_paper (paper_size, &h, &v))
printf ("\"%s\" => ", paper_size);
if (measure_paper (paper_size, &h, &v))
- printf ("%.1f x %.1f in, %.0f x %.0f mm\n",
- h / 72000., v / 72000.,
- h / (72000 / 25.4), v / (72000 / 25.4));
+ printf ("%.1f x %.1f in, %.0f x %.0f mm\n", h, v, h * 25.4, v * 25.4);
else
printf ("error\n");
lex_get (lexer);
else
printf ("error\n");
lex_get (lexer);
- return
lex_end_of_command (lexer)
;
+ return
CMD_SUCCESS
;
}
}