projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid unfounded warnings from GCC 7.2.
[pspp]
/
src
/
language
/
utilities
/
include.c
diff --git
a/src/language/utilities/include.c
b/src/language/utilities/include.c
index b0823eafcb72a8e4954b55c9dc72b558d3c6dc9e..ecb33b27670826fd8fa7ae25f1bf435b09ed0f13 100644
(file)
--- a/
src/language/utilities/include.c
+++ b/
src/language/utilities/include.c
@@
-23,7
+23,6
@@
#include <unistd.h>
#include "data/dataset.h"
#include <unistd.h>
#include "data/dataset.h"
-#include "data/file-name.h"
#include "data/session.h"
#include "language/command.h"
#include "language/lexer/include-path.h"
#include "data/session.h"
#include "language/command.h"
#include "language/lexer/include-path.h"
@@
-62,7
+61,10
@@
do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant)
if (!lex_force_string_or_id (lexer))
return CMD_FAILURE;
if (!lex_force_string_or_id (lexer))
return CMD_FAILURE;
- relative_name = utf8_to_filename (lex_tokcstr (lexer));
+ relative_name = utf8_to_filename (lex_tokcstr (lexer));
+ if (NULL == relative_name)
+ return CMD_FAILURE;
+
filename = include_path_search (relative_name);
free (relative_name);
filename = include_path_search (relative_name);
free (relative_name);