projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add "x" prefix to calls to plain malloc(), calloc(), strdup(), realloc().
[pspp-builds.git]
/
src
/
language
/
data-io
/
get-data.c
diff --git
a/src/language/data-io/get-data.c
b/src/language/data-io/get-data.c
index 54bb5653ecc2086456624e7923b9a02443b77b57..e4ab76a9992739c78a36f6ad2a98c4f6e0b48d83 100644
(file)
--- a/
src/language/data-io/get-data.c
+++ b/
src/language/data-io/get-data.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008
, 2009
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
@@
-34,6
+34,8
@@
#include <language/lexer/lexer.h>
#include <libpspp/message.h>
#include <language/lexer/lexer.h>
#include <libpspp/message.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
#define N_(msgid) (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
#define N_(msgid) (msgid)
@@
-83,7
+85,7
@@
parse_get_psql (struct lexer *lexer, struct dataset *ds)
if (!lex_force_string (lexer))
goto error;
if (!lex_force_string (lexer))
goto error;
- psql.conninfo = strdup (ds_cstr (lex_tokstr (lexer)));
+ psql.conninfo =
x
strdup (ds_cstr (lex_tokstr (lexer)));
lex_get (lexer);
lex_get (lexer);
@@
-151,7
+153,7
@@
parse_get_gnm (struct lexer *lexer, struct dataset *ds)
if (!lex_force_string (lexer))
goto error;
if (!lex_force_string (lexer))
goto error;
- gri.file_name = strdup (ds_cstr (lex_tokstr (lexer)));
+ gri.file_name =
x
strdup (ds_cstr (lex_tokstr (lexer)));
lex_get (lexer);
lex_get (lexer);
@@
-170,7
+172,7
@@
parse_get_gnm (struct lexer *lexer, struct dataset *ds)
if ( ! lex_force_string (lexer) )
goto error;
if ( ! lex_force_string (lexer) )
goto error;
- gri.sheet_name = strdup (ds_cstr (lex_tokstr (lexer)));
+ gri.sheet_name =
x
strdup (ds_cstr (lex_tokstr (lexer)));
gri.sheet_index = -1;
}
else if (lex_match_id (lexer, "INDEX"))
gri.sheet_index = -1;
}
else if (lex_match_id (lexer, "INDEX"))
@@
-194,7
+196,7
@@
parse_get_gnm (struct lexer *lexer, struct dataset *ds)
if ( ! lex_force_string (lexer) )
goto error;
if ( ! lex_force_string (lexer) )
goto error;
- gri.cell_range = strdup (ds_cstr (lex_tokstr (lexer)));
+ gri.cell_range =
x
strdup (ds_cstr (lex_tokstr (lexer)));
}
else
goto error;
}
else
goto error;