projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added (some of the) calculations for the examine command.
[pspp]
/
src
/
devind.c
diff --git
a/src/devind.c
b/src/devind.c
index 4a8da54aab812c219adec2486b7db862de41646f..ad0cbeae0437389a821b6db03efdf9b9f0f82121 100644
(file)
--- a/
src/devind.c
+++ b/
src/devind.c
@@
-88,7
+88,7
@@
#include <config.h>
#include "devind.h"
#include <config.h>
#include "devind.h"
-#include
<assert.h>
+#include
"error.h"
#include <errno.h>
#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
#include <stdlib.h>
#include <ctype.h>
@@
-220,7
+220,7
@@
devind_option (struct outp_driver *this, const char *key, const struct string *v
break;
case 1:
free (x->file.filename);
break;
case 1:
free (x->file.filename);
- x->file.filename = xstrdup (ds_
value
(val));
+ x->file.filename = xstrdup (ds_
c_str
(val));
break;
default:
assert (0);
break;
default:
assert (0);
@@
-320,7
+320,7
@@
output_tab_table (struct outp_driver *this, struct tab_table *t)
if (t->nr == 1 && t->nc == 1)
{
fputs ("p:", x->file.file);
if (t->nr == 1 && t->nc == 1)
{
fputs ("p:", x->file.file);
- escape_string (x->file.file, ls_
value
(t->cc), ls_length (t->cc));
+ escape_string (x->file.file, ls_
c_str
(t->cc), ls_length (t->cc));
putc ('\n', x->file.file);
return;
putc ('\n', x->file.file);
return;
@@
-347,7
+347,7
@@
output_tab_table (struct outp_driver *this, struct tab_table *t)
if (!ls_empty_p (&t->title))
{
putc ('T', x->file.file);
if (!ls_empty_p (&t->title))
{
putc ('T', x->file.file);
- escape_string (x->file.file, ls_
value
(&t->title),
+ escape_string (x->file.file, ls_
c_str
(&t->title),
ls_length (&t->title));
putc ('\n', x->file.file);
}
ls_length (&t->title));
putc ('\n', x->file.file);
}
@@
-376,7
+376,7
@@
output_tab_table (struct outp_driver *this, struct tab_table *t)
cc = t->cc + c + r * t->nc;
if (*ct & TAB_JOIN)
{
cc = t->cc + c + r * t->nc;
if (*ct & TAB_JOIN)
{
- j = (struct tab_joined_cell *) ls_
value
(cc);
+ j = (struct tab_joined_cell *) ls_
c_str
(cc);
cc = &j->contents;
if (c != j->x1 || r != j->y1)
continue;
cc = &j->contents;
if (c != j->x1 || r != j->y1)
continue;
@@
-399,7
+399,7
@@
output_tab_table (struct outp_driver *this, struct tab_table *t)
else
putc ('c', x->file.file);
putc ('t', x->file.file);
else
putc ('c', x->file.file);
putc ('t', x->file.file);
- escape_string (x->file.file, ls_
value
(cc), ls_length (cc));
+ escape_string (x->file.file, ls_
c_str
(cc), ls_length (cc));
putc ('\n', x->file.file);
}
}
putc ('\n', x->file.file);
}
}