projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output: Phrase output driver error messages more consistently.
[pspp-builds.git]
/
src
/
data
/
por-file-reader.c
diff --git
a/src/data/por-file-reader.c
b/src/data/por-file-reader.c
index cd8b213e8d74062bffd5b6e344a1d29047b7f9a9..55f616ec76502eef0533353c3619be7fd069fd95 100644
(file)
--- a/
src/data/por-file-reader.c
+++ b/
src/data/por-file-reader.c
@@
-102,8
+102,8
@@
error (struct pfm_reader *r, const char *msg, ...)
ds_put_vformat (&text, msg, args);
va_end (args);
ds_put_vformat (&text, msg, args);
va_end (args);
- m.category = MSG_GENERAL;
- m.severity = MSG_ERROR;
+ m.category = MSG_
C_
GENERAL;
+ m.severity = MSG_
S_
ERROR;
m.where.file_name = NULL;
m.where.line_number = 0;
m.text = ds_cstr (&text);
m.where.file_name = NULL;
m.where.line_number = 0;
m.text = ds_cstr (&text);
@@
-131,8
+131,8
@@
warning (struct pfm_reader *r, const char *msg, ...)
ds_put_vformat (&text, msg, args);
va_end (args);
ds_put_vformat (&text, msg, args);
va_end (args);
- m.category = MSG_GENERAL;
- m.severity = MSG_WARNING;
+ m.category = MSG_
C_
GENERAL;
+ m.severity = MSG_
S_
WARNING;
m.where.file_name = NULL;
m.where.line_number = 0;
m.text = ds_cstr (&text);
m.where.file_name = NULL;
m.where.line_number = 0;
m.text = ds_cstr (&text);
@@
-882,17
+882,30
@@
pfm_detect (FILE *file)
{
unsigned char header[464];
char trans[256];
{
unsigned char header[464];
char trans[256];
- int cooked_cnt, raw_cnt;
+ int cooked_cnt, raw_cnt
, line_len
;
int i;
cooked_cnt = raw_cnt = 0;
int i;
cooked_cnt = raw_cnt = 0;
+ line_len = 0;
while (cooked_cnt < sizeof header)
{
int c = getc (file);
if (c == EOF || raw_cnt++ > 512)
return false;
while (cooked_cnt < sizeof header)
{
int c = getc (file);
if (c == EOF || raw_cnt++ > 512)
return false;
- else if (c != '\n' && c != '\r')
- header[cooked_cnt++] = c;
+ else if (c == '\n')
+ {
+ while (line_len < 80 && cooked_cnt < sizeof header)
+ {
+ header[cooked_cnt++] = ' ';
+ line_len++;
+ }
+ line_len = 0;
+ }
+ else if (c != '\r')
+ {
+ header[cooked_cnt++] = c;
+ line_len++;
+ }
}
memset (trans, 0, 256);
}
memset (trans, 0, 256);