projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added src/ui/terminal/automake.mk and src/ui/gui/automake.mk
[pspp]
/
src
/
var-labs.c
diff --git
a/src/var-labs.c
b/src/var-labs.c
index 4c9781bf5a8c1aab7d028eaa326ea66370261ccf..3b5aa83821baa2a7c2d216cef17df629fc69312d 100644
(file)
--- a/
src/var-labs.c
+++ b/
src/var-labs.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 <stdio.h>
#include <config.h>
#include <stdio.h>
@@
-27,18
+27,21
@@
#include "str.h"
#include "var.h"
#include "str.h"
#include "var.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
#include "debug-print.h"
int
cmd_variable_labels (void)
{
#include "debug-print.h"
int
cmd_variable_labels (void)
{
- struct variable **v;
- int nv;
-
- int i;
-
do
{
do
{
+ struct variable **v;
+ size_t nv;
+
+ size_t i;
+
if (!parse_variables (default_dict, &v, &nv, PV_NONE))
return CMD_PART_SUCCESS_MAYBE;
if (!parse_variables (default_dict, &v, &nv, PV_NONE))
return CMD_PART_SUCCESS_MAYBE;
@@
-74,5
+77,8
@@
cmd_variable_labels (void)
const char *
var_to_string(const struct variable *var)
{
const char *
var_to_string(const struct variable *var)
{
+ if ( !var )
+ return 0;
+
return ( var->label ? var->label : var->name);
}
return ( var->label ? var->label : var->name);
}