X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fpor-file-reader.c;h=b5cc35b825ba73c27ae015971fd249afdf9e749e;hb=af630812b8f5738d1574aae723034601ecc7307b;hp=343615a826fcecb70f6e013b101b4cba1c6f36b1;hpb=9e583dc3ff4b8cae46ac0fb1b1d6816061ea951f;p=pspp diff --git a/src/data/por-file-reader.c b/src/data/por-file-reader.c index 343615a826..b5cc35b825 100644 --- a/src/data/por-file-reader.c +++ b/src/data/por-file-reader.c @@ -112,12 +112,13 @@ error (struct pfm_reader *r, const char *msg, ...) ds_put_vformat (&text, msg, args); va_end (args); - struct msg m = { + struct msg *m = xmalloc (sizeof *m); + *m = (struct msg) { .category = MSG_C_GENERAL, .severity = MSG_S_ERROR, - .text = ds_cstr (&text), + .text = ds_steal_cstr (&text), }; - msg_emit (&m); + msg_emit (m); r->ok = false; @@ -139,12 +140,13 @@ warning (struct pfm_reader *r, const char *msg, ...) ds_put_vformat (&text, msg, args); va_end (args); - struct msg m = { + struct msg *m = xmalloc (sizeof *m); + *m = (struct msg) { .category = MSG_C_GENERAL, .severity = MSG_S_WARNING, - .text = ds_cstr (&text), + .text = ds_steal_cstr (&text), }; - msg_emit (&m); + msg_emit (m); } /* Close and destroy R. @@ -899,7 +901,7 @@ por_file_casereader_read (struct casereader *reader, void *r_) int width = caseproto_get_width (r->proto, i); if (width == 0) - case_data_rw_idx (c, i)->f = read_float (r); + *case_num_rw_idx (c, i) = read_float (r); else { uint8_t buf[256];