projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Whitespace changes only
[pspp]
/
utilities
/
pspp-convert.c
diff --git
a/utilities/pspp-convert.c
b/utilities/pspp-convert.c
index f53e28a83e1ca2262366e3ec75d256bb3b17a093..f21e5bdb8b907cb51a25a331d9311f436fc743e5 100644
(file)
--- a/
utilities/pspp-convert.c
+++ b/
utilities/pspp-convert.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2013, 2014, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2013, 2014, 2015
, 2016
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
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
@@
-26,6
+26,7
@@
#include "data/casereader.h"
#include "data/casewriter.h"
#include "data/csv-file-writer.h"
#include "data/casereader.h"
#include "data/casewriter.h"
#include "data/csv-file-writer.h"
+#include "data/dictionary.h"
#include "data/encrypted-file.h"
#include "data/file-name.h"
#include "data/por-file-writer.h"
#include "data/encrypted-file.h"
#include "data/file-name.h"
#include "data/por-file-writer.h"
@@
-60,12
+61,12
@@
main (int argc, char *argv[])
long long int max_cases = LLONG_MAX;
struct dictionary *dict = NULL;
struct casereader *reader;
long long int max_cases = LLONG_MAX;
struct dictionary *dict = NULL;
struct casereader *reader;
- struct file_handle *input_fh;
+ struct file_handle *input_fh
= NULL
;
const char *encoding = NULL;
struct encrypted_file *enc;
const char *output_format = NULL;
const char *encoding = NULL;
struct encrypted_file *enc;
const char *output_format = NULL;
- struct file_handle *output_fh;
+ struct file_handle *output_fh
= NULL
;
struct casewriter *writer;
const char *password = NULL;
struct casewriter *writer;
const char *password = NULL;
@@
-165,7
+166,7
@@
main (int argc, char *argv[])
if (! decrypt_file (enc, input_fh, output_fh, password))
goto error;
if (! decrypt_file (enc, input_fh, output_fh, password))
goto error;
-
+
goto exit;
}
goto exit;
}
@@
-202,6
+203,8
@@
main (int argc, char *argv[])
output_filename);
NOT_REACHED ();
}
output_filename);
NOT_REACHED ();
}
+ if (!writer)
+ error (1, 0, _("%s: error opening output file"), output_filename);
for (i = 0; i < max_cases; i++)
{
for (i = 0; i < max_cases; i++)
{