From: John Darrington Date: Wed, 3 Jul 2019 18:01:30 +0000 (+0200) Subject: Remove UNUSED attributes where they were inappropriate. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a09f7e0127967c4f04a51f1b9cf91040c515c34;p=pspp Remove UNUSED attributes where they were inappropriate. These parameters were marked UNUSED, when they were in fact, used. --- diff --git a/src/data/dataset.c b/src/data/dataset.c index c426cddb3c..b94a3675c6 100644 --- a/src/data/dataset.c +++ b/src/data/dataset.c @@ -939,7 +939,7 @@ add_filter_trns (struct dataset *ds) /* FILTER transformation. */ static int filter_trns_proc (void *filter_var_, - struct ccase **c UNUSED, casenumber case_nr UNUSED) + struct ccase **c, casenumber case_nr UNUSED) { struct variable *filter_var = filter_var_; diff --git a/src/data/datasheet.c b/src/data/datasheet.c index 2847703d1e..e9d2b2f352 100644 --- a/src/data/datasheet.c +++ b/src/data/datasheet.c @@ -604,8 +604,8 @@ datasheet_get_value (const struct datasheet *ds, casenumber row, successful, false on I/O error. On failure, ROW might be partially modified or corrupted. */ bool -datasheet_put_value (struct datasheet *ds UNUSED, casenumber row UNUSED, - size_t column UNUSED, const union value *value UNUSED) +datasheet_put_value (struct datasheet *ds, casenumber row, + size_t column, const union value *value) { return rw_case (ds, OP_WRITE, row, column, 1, (union value *) value); } diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c index 5fee6919c0..fe5e866256 100644 --- a/src/data/gnumeric-reader.c +++ b/src/data/gnumeric-reader.c @@ -494,7 +494,8 @@ struct var_spec static void gnumeric_error_handler (void *ctx, const char *mesg, - UNUSED xmlParserSeverities sev, xmlTextReaderLocatorPtr loc) + xmlParserSeverities sev UNUSED, + xmlTextReaderLocatorPtr loc) { struct gnumeric_reader *r = ctx; diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c index 457edeb4fc..dfd9891298 100644 --- a/src/data/ods-reader.c +++ b/src/data/ods-reader.c @@ -553,7 +553,8 @@ get_sheet_count (struct zip_reader *zreader) static void ods_error_handler (void *ctx, const char *mesg, - UNUSED xmlParserSeverities sev, xmlTextReaderLocatorPtr loc) + xmlParserSeverities sev UNUSED, + xmlTextReaderLocatorPtr loc) { struct ods_reader *r = ctx; diff --git a/src/language/data-io/data-parser.c b/src/language/data-io/data-parser.c index d223b05304..b3c4b54cbb 100644 --- a/src/language/data-io/data-parser.c +++ b/src/language/data-io/data-parser.c @@ -815,7 +815,7 @@ data_parser_casereader_read (struct casereader *reader UNUSED, void *r_) } static void -data_parser_casereader_destroy (struct casereader *reader UNUSED, void *r_) +data_parser_casereader_destroy (struct casereader *reader, void *r_) { struct data_parser_casereader *r = r_; if (dfm_reader_error (r->reader)) diff --git a/src/language/data-io/inpt-pgm.c b/src/language/data-io/inpt-pgm.c index b9488f17f4..d7523f58d2 100644 --- a/src/language/data-io/inpt-pgm.c +++ b/src/language/data-io/inpt-pgm.c @@ -239,7 +239,7 @@ destroy_input_program (struct input_program_pgm *pgm) /* Destroys the casereader. */ static void -input_program_casereader_destroy (struct casereader *reader UNUSED, void *inp_) +input_program_casereader_destroy (struct casereader *reader, void *inp_) { struct input_program_pgm *inp = inp_; if (inp->restart == TRNS_ERROR) diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c index 10ee6c8073..d8a37cdd65 100644 --- a/src/language/dictionary/sys-file-info.c +++ b/src/language/dictionary/sys-file-info.c @@ -103,7 +103,7 @@ add_row (struct pivot_table *table, const char *attribute, /* SYSFILE INFO utility. */ int -cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED) +cmd_sysfile_info (struct lexer *lexer, struct dataset *ds) { struct any_reader *any_reader; struct file_handle *h; diff --git a/src/language/stats/flip.c b/src/language/stats/flip.c index 2ed7278d6b..7f4841d293 100644 --- a/src/language/stats/flip.c +++ b/src/language/stats/flip.c @@ -451,7 +451,7 @@ flip_casereader_read (struct casereader *reader, void *flip_) Returns true if successful read, false if an I/O occurred during destruction or previously. */ static void -flip_casereader_destroy (struct casereader *reader UNUSED, void *flip_) +flip_casereader_destroy (struct casereader *reader, void *flip_) { struct flip_pgm *flip = flip_; if (flip->error) diff --git a/src/language/stats/logistic.c b/src/language/stats/logistic.c index 66a4111c7f..9794ed62c8 100644 --- a/src/language/stats/logistic.c +++ b/src/language/stats/logistic.c @@ -418,7 +418,7 @@ frq_update (const void *aux1 UNUSED, void *aux2 UNUSED, } static void -frq_destroy (const void *aux1 UNUSED, void *aux2 UNUSED, void *user_data UNUSED) +frq_destroy (const void *aux1 UNUSED, void *aux2 UNUSED, void *user_data) { free (user_data); } diff --git a/src/output/cairo.c b/src/output/cairo.c index b3bb1de366..739a34133d 100644 --- a/src/output/cairo.c +++ b/src/output/cairo.c @@ -1445,7 +1445,7 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, if (bb[V][0] + h >= bb[V][1] && !(options & TAB_ROTATE)) { PangoLayoutIter *iter; - int best UNUSED = 0; + int best = 0; /* Choose a breakpoint between lines instead of in the middle of one. */ iter = pango_layout_get_iter (font->layout);