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 fd738ababba65e1e344a053d53466f1722eb0b6c..f2bb3400aaed277c80fc1bdb90653ac7dc96475f 100644
(file)
--- a/
src/postscript.c
+++ b/
src/postscript.c
@@
-40,10
+40,10
@@
#include "font.h"
#include "getl.h"
#include "getline.h"
#include "font.h"
#include "getl.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"
@@
-320,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;
@@
-1902,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;
@@
-2105,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,
@@
-2735,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;
}