X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fascii.c;h=a6bcb106d68effd619d93ebdb559cac0dd06f09e;hb=5f379b736b5797b0583e99652d51a35a23ba38f8;hp=cd5fcec64b06ab8c704f4b2fa9b3157089e59450;hpb=22c639606904655579afbff9dd0f6319becbb6dd;p=pspp diff --git a/src/output/ascii.c b/src/output/ascii.c index cd5fcec64b..a6bcb106d6 100644 --- a/src/output/ascii.c +++ b/src/output/ascii.c @@ -370,9 +370,7 @@ ascii_create (struct file_handle *fh, enum settings_output_devices device_type, { enum { BOX_ASCII, BOX_UNICODE } box; struct output_driver *d; - struct ascii_driver *a; - - a = xzalloc (sizeof *a); + struct ascii_driver *a = XZALLOC (struct ascii_driver); d = &a->driver; output_driver_init (&a->driver, &ascii_driver_class, fh_get_file_name (fh), device_type); a->append = parse_boolean (opt (d, o, "append", "false")); @@ -645,7 +643,7 @@ ascii_submit (struct output_driver *driver, const struct output_item *item) break; case OUTPUT_ITEM_GROUP: - NOT_REACHED (); + break; case OUTPUT_ITEM_PAGE_BREAK: break; @@ -1033,8 +1031,8 @@ ascii_test_write (struct output_driver *driver, .underline = underline, }; const struct pivot_value value = { - .type = PIVOT_VALUE_TEXT, .text = { + .type = PIVOT_VALUE_TEXT, .local = CONST_CAST (char *, s), .c = CONST_CAST (char *, s), .id = CONST_CAST (char *, s),