projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change type of variables whose addresses are passed to dict_get_vars()
[pspp]
/
src
/
dfm-read.c
diff --git
a/src/dfm-read.c
b/src/dfm-read.c
index e12864ac7c7ceff8bf1fe1d4c4fa9c6d716f77af..2f17d41980fcdc04329e74e8fcafbd8af042e66f 100644
(file)
--- a/
src/dfm-read.c
+++ b/
src/dfm-read.c
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#include <config.h>
#include "dfm-read.h"
#include <config.h>
#include "dfm-read.h"
@@
-28,11
+28,14
@@
#include "error.h"
#include "file-handle.h"
#include "filename.h"
#include "error.h"
#include "file-handle.h"
#include "filename.h"
-#include "getl
ine
.h"
+#include "getl.h"
#include "lexer.h"
#include "str.h"
#include "vfm.h"
#include "lexer.h"
#include "str.h"
#include "vfm.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
#include "debug-print.h"
/* Flags for DFM readers. */
#include "debug-print.h"
/* Flags for DFM readers. */
@@
-81,8
+84,9
@@
dfm_close_reader (struct dfm_reader *r)
if (!still_open)
{
/* Skip any remaining data on the inline file. */
if (!still_open)
{
/* Skip any remaining data on the inline file. */
- while ((r->flags & DFM_EOF) == 0)
- read_record (r);
+ if (r->flags & DFM_SAW_BEGIN_DATA)
+ while ((r->flags & DFM_EOF) == 0)
+ read_record (r);
inline_file = NULL;
}
}
inline_file = NULL;
}
}
@@
-326,7
+330,7
@@
dfm_eof (struct dfm_reader *r)
which is not null-terminated. The caller must not free or
modify the returned string. */
void
which is not null-terminated. The caller must not free or
modify the returned string. */
void
-dfm_get_record (struct dfm_reader *r, struct
len
_string *line)
+dfm_get_record (struct dfm_reader *r, struct
fixed
_string *line)
{
assert ((r->flags & DFM_ADVANCE) == 0);
assert ((r->flags & DFM_EOF) == 0);
{
assert ((r->flags & DFM_ADVANCE) == 0);
assert ((r->flags & DFM_EOF) == 0);