X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvar-labs.c;h=3b5aa83821baa2a7c2d216cef17df629fc69312d;hb=53ceff2865473a6b561b521986fafd31a993a1a6;hp=4c9781bf5a8c1aab7d028eaa326ea66370261ccf;hpb=efbbea5561a1c11b3f794906d1d10dc31b27e21b;p=pspp

diff --git a/src/var-labs.c b/src/var-labs.c
index 4c9781bf5a..3b5aa83821 100644
--- 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
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include <stdio.h>
@@ -27,18 +27,21 @@
 #include "str.h"
 #include "var.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 #include "debug-print.h"
 
 int
 cmd_variable_labels (void)
 {
-  struct variable **v;
-  int nv;
-
-  int i;
-
   do
     {
+      struct variable **v;
+      size_t nv;
+
+      size_t i;
+
       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)
 {
+  if ( !var ) 
+    return 0;
+
   return ( var->label ? var->label : var->name);
 }