projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrote most of the examine command.
[pspp-builds.git]
/
src
/
postscript.c
diff --git
a/src/postscript.c
b/src/postscript.c
index b911f8ccdd6ec08588b6a6996aac77cd8dbea060..4a2fab0b5848e82f45adec32feb7fb36c5dc8eea 100644
(file)
--- a/
src/postscript.c
+++ b/
src/postscript.c
@@
-23,7
+23,7
@@
#if !NO_POSTSCRIPT
#include <ctype.h>
#if !NO_POSTSCRIPT
#include <ctype.h>
-#include
<assert.h>
+#include
"error.h"
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
@@
-567,7
+567,7
@@
ps_option (struct outp_driver *this, const char *key, const struct string *val)
{
struct ps_driver_ext *x = this->ext;
int cat, subcat;
{
struct ps_driver_ext *x = this->ext;
int cat, subcat;
- char *value = ds_
value
(val);
+ char *value = ds_
c_str
(val);
cat = outp_match_keyword (key, option_tab, &option_info, &subcat);
cat = outp_match_keyword (key, option_tab, &option_info, &subcat);
@@
-661,6
+661,7
@@
ps_option (struct outp_driver *this, const char *key, const struct string *val)
break;
default:
assert (0);
break;
default:
assert (0);
+ abort ();
}
if (setting)
x->output_options |= mask;
}
if (setting)
x->output_options |= mask;
@@
-762,6
+763,7
@@
ps_option (struct outp_driver *this, const char *key, const struct string *val)
break;
default:
assert (0);
break;
default:
assert (0);
+ abort ();
}
if (*dest)
free (*dest);
}
if (*dest)
free (*dest);
@@
-896,8
+898,8
@@
output_encodings (struct outp_driver *this)
struct string line, buf;
struct string line, buf;
- ds_init (
NULL,
&line, 128);
- ds_init (
NULL,
&buf, 128);
+ ds_init (&line, 128);
+ ds_init (&buf, 128);
for (pe = hsh_first (x->encodings, &iter); pe != NULL;
pe = hsh_next (x->encodings, &iter))
{
for (pe = hsh_first (x->encodings, &iter); pe != NULL;
pe = hsh_next (x->encodings, &iter))
{
@@
-944,7
+946,7
@@
output_encodings (struct outp_driver *this)
if (buf.length == 0)
continue;
if (buf.length == 0)
continue;
- pschar = strtok_r (ds_
value
(&buf), " \t\r\n", &sp);
+ pschar = strtok_r (ds_
c_str
(&buf), " \t\r\n", &sp);
code = strtok_r (NULL, " \t\r\n", &sp);
if (*pschar == 0 || *code == 0)
continue;
code = strtok_r (NULL, " \t\r\n", &sp);
if (*pschar == 0 || *code == 0)
continue;
@@
-982,14
+984,14
@@
output_encodings (struct outp_driver *this)
if (ds_length (&line) + strlen (temp) > 70)
{
if (ds_length (&line) + strlen (temp) > 70)
{
- ds_
concat
(&line, x->eol);
- fputs (ds_
value
(&line), x->file.file);
+ ds_
puts
(&line, x->eol);
+ fputs (ds_
c_str
(&line), x->file.file);
ds_clear (&line);
}
ds_clear (&line);
}
- ds_
concat
(&line, temp);
+ ds_
puts
(&line, temp);
}
}
- ds_
concat
(&line, x->eol);
- fputs (ds_
value
(&line), x->file.file);
+ ds_
puts
(&line, x->eol);
+ fputs (ds_
c_str
(&line), x->file.file);
if (fclose (f) == EOF)
msg (MW, _("PostScript driver: Error closing encoding file `%s'."),
if (fclose (f) == EOF)
msg (MW, _("PostScript driver: Error closing encoding file `%s'."),
@@
-1102,7
+1104,7
@@
read_ps_encodings (struct outp_driver *this)
where.line_number = 0;
err_push_file_locator (&where);
where.line_number = 0;
err_push_file_locator (&where);
- ds_init (
NULL,
&line, 128);
+ ds_init (&line, 128);
for (;;)
{
for (;;)
{
@@
-2410,6
+2412,7
@@
write_text (struct outp_driver *this,
break;
default:
assert (0);
break;
default:
assert (0);
+ abort ();
}
lp = line;
}
lp = line;
@@
-2540,7
+2543,7
@@
text (struct outp_driver *this, struct outp_text *t, int draw)
buf_loc = buf;
assert (!ls_null_p (&t->s));
buf_loc = buf;
assert (!ls_null_p (&t->s));
- cp = ls_
value
(&t->s);
+ cp = ls_
c_str
(&t->s);
end = ls_end (&t->s);
if (draw)
{
end = ls_end (&t->s);
if (draw)
{
@@
-2575,7
+2578,7
@@
text (struct outp_driver *this, struct outp_text *t, int draw)
char_name = local_char_name;
if (ext->current->font->ligatures && *cp == 'f')
{
char_name = local_char_name;
if (ext->current->font->ligatures && *cp == 'f')
{
- int lig;
+ int lig
= 0
;
char_name = NULL;
if (cp < end - 1)
char_name = NULL;
if (cp < end - 1)
@@
-2604,7
+2607,7
@@
text (struct outp_driver *this, struct outp_text *t, int draw)
}
if ((lig & ext->current->font->ligatures) == 0)
{
}
if ((lig & ext->current->font->ligatures) == 0)
{
- local_char_name[0] = *cp
++;
/* 'f' */
+ local_char_name[0] = *cp
;
/* 'f' */
char_name = local_char_name;
}
}
char_name = local_char_name;
}
}