X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fcasewriter-translator.c;h=c630b44cda397dfffccd980c9d3ecb65255e91dc;hb=ee7be3e962a4faba54d7bc01364365b51167242c;hp=f2a0b68e6a5683d6c903ed40de0510ca4f88742c;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp diff --git a/src/data/casewriter-translator.c b/src/data/casewriter-translator.c index f2a0b68e6a..c630b44cda 100644 --- a/src/data/casewriter-translator.c +++ b/src/data/casewriter-translator.c @@ -29,17 +29,29 @@ struct casewriter_translator { struct casewriter *subwriter; - void (*translate) (const struct ccase *input, struct ccase *output, - void *aux); + void (*translate) (struct ccase *input, struct ccase *output, void *aux); bool (*destroy) (void *aux); void *aux; }; -static struct casewriter_class casewriter_translator_class; +static const struct casewriter_class casewriter_translator_class; +/* Creates and returns a new casewriter whose cases are passed + through TRANSLATE, which must create case OUTPUT, with + OUTPUT_VALUE_CNT values, and populate it based on INPUT and + auxiliary data AUX. The translated cases are then written to + SUBWRITER. TRANSLATE must also destroy INPUT. + + When the translating casewriter is destroyed, DESTROY will be + called to allow any state maintained by TRANSLATE to be freed. + + After this function is called, SUBWRITER must not ever again + be referenced directly. It will be destroyed automatically + when the translating casewriter is destroyed. */ struct casewriter * casewriter_create_translator (struct casewriter *subwriter, - void (*translate) (const struct ccase *input, + size_t translated_value_cnt, + void (*translate) (struct ccase *input, struct ccase *output, void *aux), bool (*destroy) (void *aux), @@ -51,7 +63,8 @@ casewriter_create_translator (struct casewriter *subwriter, ct->translate = translate; ct->destroy = destroy; ct->aux = aux; - writer = casewriter_create (&casewriter_translator_class, ct); + writer = casewriter_create (translated_value_cnt, + &casewriter_translator_class, ct); taint_propagate (casewriter_get_taint (ct->subwriter), casewriter_get_taint (writer)); return writer; @@ -88,7 +101,7 @@ casewriter_translator_convert_to_reader (struct casewriter *writer UNUSED, return reader; } -static struct casewriter_class casewriter_translator_class = +static const struct casewriter_class casewriter_translator_class = { casewriter_translator_write, casewriter_translator_destroy,