X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fdata-reader.h;h=7f7355da07fef98725608c403ccc01e1790ff288;hb=3da49359c52cb783db907cc197847bbd5e721c97;hp=c7fee613d01caefe81f5edf5fe10c6f0538dc84f;hpb=d8dfafee045cf6ef58db3cc6647922ddc74abe1a;p=pspp diff --git a/src/language/data-io/data-reader.h b/src/language/data-io/data-reader.h index c7fee613d0..7f7355da07 100644 --- a/src/language/data-io/data-reader.h +++ b/src/language/data-io/data-reader.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,8 +38,7 @@ bool dfm_reader_error (const struct dfm_reader *); unsigned dfm_eof (struct dfm_reader *); struct substring dfm_get_record (struct dfm_reader *); void dfm_expand_tabs (struct dfm_reader *); -enum legacy_encoding dfm_reader_get_legacy_encoding ( - const struct dfm_reader *); +const char *dfm_reader_get_legacy_encoding (const struct dfm_reader *); int dfm_get_percent_read (const struct dfm_reader *); /* Line control. */ @@ -50,8 +49,8 @@ size_t dfm_column_start (const struct dfm_reader *); size_t dfm_columns_past_end (const struct dfm_reader *); size_t dfm_get_column (const struct dfm_reader *, const char *); -/* File stack. */ -void dfm_push (struct dfm_reader *); -void dfm_pop (struct dfm_reader *); +/* Information. */ +const char *dfm_get_file_name (const struct dfm_reader *); +int dfm_get_line_number (const struct dfm_reader *); #endif /* data-reader.h */