projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up file handle code in preparation to add temporary file
[pspp]
/
src
/
postscript.c
diff --git
a/src/postscript.c
b/src/postscript.c
index c828a0df2a49136cf73433458384996355516d31..f2bb3400aaed277c80fc1bdb90653ac7dc96475f 100644
(file)
--- a/
src/postscript.c
+++ b/
src/postscript.c
@@
-27,36
+27,30
@@
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
+#include <time.h>
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-
#include "alloc.h"
#include "bitvector.h"
#include "error.h"
#include "filename.h"
#include "font.h"
#include "alloc.h"
#include "bitvector.h"
#include "error.h"
#include "filename.h"
#include "font.h"
+#include "getl.h"
#include "getline.h"
#include "getline.h"
+#include "glob.h"
#include "hash.h"
#include "main.h"
#include "misc.h"
#include "hash.h"
#include "main.h"
#include "misc.h"
-#include "misc.h"
#include "output.h"
#include "som.h"
#include "version.h"
#include "output.h"
#include "som.h"
#include "version.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
/* FIXMEs:
optimize-text-size not implemented.
/* FIXMEs:
optimize-text-size not implemented.
@@
-326,7
+320,7
@@
ps_preopen_driver (struct outp_driver *this)
assert (this->driver_open == 0);
msg (VM (1), _("PostScript driver initializing as `%s'..."), this->name);
assert (this->driver_open == 0);
msg (VM (1), _("PostScript driver initializing as `%s'..."), this->name);
- this->ext = x = xmalloc (sizeof
(struct ps_driver_ext)
);
+ this->ext = x = xmalloc (sizeof
*x
);
this->res = PSUS;
this->horiz = this->vert = 1;
this->width = this->length = 0;
this->res = PSUS;
this->horiz = this->vert = 1;
this->width = this->length = 0;
@@
-1452,7
+1446,7
@@
postopen (struct file_ext *f)
char *beg;
beg = buf2 = fn_interp_vars (buf, ps_get_var);
len = strlen (buf2);
char *beg;
beg = buf2 = fn_interp_vars (buf, ps_get_var);
len = strlen (buf2);
- while (isspace (*beg))
+ while (isspace (
(unsigned char)
*beg))
beg++, len--;
if (beg[len - 1] == '\n')
len--;
beg++, len--;
if (beg[len - 1] == '\n')
len--;
@@
-1494,7
+1488,7
@@
quote_ps_name (char *dest, const char *string)
const char *sp;
for (sp = string; *sp; sp++)
const char *sp;
for (sp = string; *sp; sp++)
- switch (*
(unsigned char *)
sp)
+ switch (*sp)
{
case 'a':
case 'f':
{
case 'a':
case 'f':
@@
-1569,7
+1563,7
@@
quote_ps_name (char *dest, const char *string)
*dp++ = '<';
for (sp = string; *sp && dp < &dest[256]; sp++)
{
*dp++ = '<';
for (sp = string; *sp && dp < &dest[256]; sp++)
{
- sprintf (dp, "%02x",
*(unsigned char *)
sp);
+ sprintf (dp, "%02x",
(unsigned char) *
sp);
dp += 2;
}
return stpcpy (dp, ">cvn");
dp += 2;
}
return stpcpy (dp, ">cvn");
@@
-1594,7
+1588,7
@@
quote_ps_string (char *dest, const char *string)
dp = stpcpy (dp, "\\(");
else if (*sp == ')')
dp = stpcpy (dp, "\\)");
dp = stpcpy (dp, "\\(");
else if (*sp == ')')
dp = stpcpy (dp, "\\)");
- else if (*sp < 32 ||
*((unsigned char *) sp)
> 127)
+ else if (*sp < 32 ||
(unsigned char) *sp
> 127)
dp = spprintf (dp, "\\%3o", *sp);
else
*dp++ = *sp;
dp = spprintf (dp, "\\%3o", *sp);
else
*dp++ = *sp;
@@
-1908,7
+1902,7
@@
line (struct outp_driver *this, int type, int ind, int dep1, int dep2)
if ((*f)->ndep >= (*f)->mdep)
{
(*f)->mdep += 16;
if ((*f)->ndep >= (*f)->mdep)
{
(*f)->mdep += 16;
- *f = xrealloc (*f,
(sizeof **f + sizeof (int[2]) * ((*f)->mdep - 1)
));
+ *f = xrealloc (*f,
sizeof **f + sizeof (int[2]) * ((*f)->mdep - 1
));
}
(*f)->dep[(*f)->ndep][0] = dep1;
(*f)->dep[(*f)->ndep][1] = dep2;
}
(*f)->dep[(*f)->ndep][0] = dep1;
(*f)->dep[(*f)->ndep][1] = dep2;
@@
-2111,7
+2105,7
@@
draw_headers (struct outp_driver *this)
int rh_width;
char buf[128];
int rh_width;
char buf[128];
- sprintf (buf, _("%s - Page %d"),
curdate
, ext->page_number);
+ sprintf (buf, _("%s - Page %d"),
get_start_date ()
, ext->page_number);
rh_width = text_width (this, buf);
out_text_plain (this, buf, this->width - this->prop_em_width - rh_width,
rh_width = text_width (this, buf);
out_text_plain (this, buf, this->width - this->prop_em_width - rh_width,
@@
-2472,7
+2466,7
@@
write_text (struct outp_driver *this,
if (TEST_BIT (literal_chars[ext->data], cp->ch))
*lp++ = cp->ch;
else
if (TEST_BIT (literal_chars[ext->data], cp->ch))
*lp++ = cp->ch;
else
- switch (cp->ch)
+ switch (
(char)
cp->ch)
{
case '(':
lp = stpcpy (lp, "\\(");
{
case '(':
lp = stpcpy (lp, "\\(");
@@
-2741,7
+2735,7
@@
text (struct outp_driver *this, struct outp_text *t, int draw)
}
else
{
}
else
{
- buf = x
realloc (buf, sizeof *buf * buf_len * 2
);
+ buf = x
nrealloc (buf, buf_len * 2, sizeof *buf
);
buf_loc = buf + buf_len;
buf_end = buf + buf_len * 2;
}
buf_loc = buf + buf_len;
buf_end = buf + buf_len * 2;
}