projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update all #include directives to the currently preferred style.
[pspp-builds.git]
/
src
/
output
/
measure.c
diff --git
a/src/output/measure.c
b/src/output/measure.c
index 8f6e666f667a83086dae4bd31274bf19387c3170..14cd5dab9fdb56de6e263a4b4162a94df60dc4cb 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 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2007, 2009
, 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
@@
-16,17
+16,17
@@
#include <config.h>
#include <config.h>
-#include
<output/measure.h>
+#include
"output/measure.h"
#include <ctype.h>
#include <errno.h>
#if HAVE_LC_PAPER
#include <langinfo.h>
#endif
#include <ctype.h>
#include <errno.h>
#if HAVE_LC_PAPER
#include <langinfo.h>
#endif
-#include <libpspp/str.h>
#include <stdlib.h>
#include <stdlib.h>
-#include <data/file-name.h>
+#include "data/file-name.h"
+#include "libpspp/str.h"
#include "gl/error.h"
#include "gl/error.h"
@@
-245,7
+245,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
\"%s\"
"), file_name);
+ error (0, errno, _("error opening
input file `%s'
"), file_name);
return false;
}
return false;
}
@@
-256,7
+256,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
\"%s\"
"), file_name);
+ error (0, errno, _("error reading
file `%s'
"), file_name);
break;
}
break;
}
@@
-273,7
+273,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"),
+ error (0, 0, _("paper size file
`%s'
does not state a paper size"),
file_name);
return false;
}
file_name);
return false;
}