X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput.c;h=ba620e061314f493f5138a6add50117405345ce4;hb=6950df40513e606e6be42fa83a36a281f654d553;hp=60d240104afc5b940427f8d8e742b86a263d1dd1;hpb=cec355d10ca3bc2e40c76efce9805eb3b1b9c212;p=pspp diff --git a/src/output.c b/src/output.c index 60d240104a..ba620e0613 100644 --- a/src/output.c +++ b/src/output.c @@ -25,7 +25,6 @@ #include #include #include "alloc.h" -#include "devind.h" #include "error.h" #include "filename.h" #include "htmlP.h" @@ -34,6 +33,9 @@ #include "settings.h" #include "str.h" +#include "gettext.h" +#define _(msgid) gettext (msgid) + /* FIXME? Should the output configuration format be changed to drivername:classname:devicetype:options, where devicetype is zero or more of screen, printer, listing? */ @@ -228,7 +230,6 @@ outp_init (void) extern struct outp_class epsf_class; #endif extern struct outp_class html_class; - extern struct outp_class devind_class; char def[] = "default"; @@ -239,7 +240,6 @@ outp_init (void) add_class (&epsf_class); add_class (&postscript_class); #endif - add_class (&devind_class); add_class (&ascii_class); add_name (def, &def[strlen (def)], OUTP_S_INIT_FILE); @@ -293,7 +293,7 @@ outp_read_devices (void) if (init_fn == NULL) { msg (IE, _("Cannot find output initialization file. " - "Use `-vvvv' to view search path.")); + "Use `-vvvvv' to view search path.")); goto exit; } @@ -455,8 +455,13 @@ outp_done (void) free(n); n = next; } + outp_class_list = NULL; + free (outp_title); + outp_title = NULL; + free (outp_subtitle); + outp_subtitle = NULL; return 1; } @@ -903,7 +908,7 @@ outp_match_keyword (const char *s, struct outp_option *tab, *++cp = 0; info->initial = xstrdup (s); - info->options = xmalloc (sizeof *info->options * (cp - s)); + info->options = xnmalloc (cp - s, sizeof *info->options); memcpy (info->options, ptr, sizeof *info->options * (cp - s)); }