X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvariable-label.c;h=d56db519c7b6de40a44716084a6aaa7ad1d401ea;hb=871f4456a207925fdce3df3150af3f3b263b2776;hp=1ae3bc5fbff639e8e53278cdb95d9dde1d910d7e;hpb=3816248a008a4af75aac6319d0c9929cb7ff679e;p=pspp-builds.git diff --git a/src/language/dictionary/variable-label.c b/src/language/dictionary/variable-label.c index 1ae3bc5f..d56db519 100644 --- a/src/language/dictionary/variable-label.c +++ b/src/language/dictionary/variable-label.c @@ -1,6 +1,5 @@ /* PSPP - computes sample statistics. Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -62,11 +61,7 @@ cmd_variable_labels (struct lexer *lexer, struct dataset *ds) ds_truncate (&label, 255); } for (i = 0; i < nv; i++) - { - if (v[i]->label) - free (v[i]->label); - v[i]->label = ds_xstrdup (&label); - } + var_set_label (v[i], ds_cstr (&label)); ds_destroy (&label); lex_get (lexer); @@ -80,11 +75,3 @@ cmd_variable_labels (struct lexer *lexer, struct dataset *ds) -const char * -var_to_string(const struct variable *var) -{ - if ( !var ) - return 0; - - return ( var->label ? var->label : var->name); -}