X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcount.c;h=90275084a6e5848f1ef01f31ea411a938168bb48;hb=45b8514ebb8a7b10eb5d911a231a9fc7974f8ba9;hp=665248de6ca591ecb2de02406c00b8b12cd99ab5;hpb=05e356b2a3087e819ef3b5388e29c822f41502e1;p=pspp

diff --git a/src/count.c b/src/count.c
index 665248de6c..90275084a6 100644
--- a/src/count.c
+++ b/src/count.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 "error.h"
@@ -29,6 +29,9 @@
 #include "str.h"
 #include "var.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 /* Implementation details:
 
    The S?SS manuals do not specify the order that COUNT subcommands are
@@ -108,7 +111,7 @@ struct cnt_var_info
     struct cnt_var_info *next;
 
     struct variable *d;		/* Destination variable. */
-    char n[SHORT_NAME_LEN + 1];	/* Name of dest var. */
+    char n[LONG_NAME_LEN + 1];	/* Name of dest var. */
 
     struct counting *c;		/* The counting specifications. */
   };
@@ -145,7 +148,7 @@ cmd_count (void)
       cnt->d = NULL;
       cnt->c = NULL;
 
-      /* Get destination struct variable, or at least its name. */
+      /* Get destination variable, or at least its name. */
       if (!lex_force_id ())
 	goto fail;
       cnt->d = dict_lookup_var (default_dict, tokid);
@@ -158,7 +161,7 @@ cmd_count (void)
 	    }
 	}
       else
-	strcpy (cnt->n, tokid);
+	str_copy_trunc (cnt->n, sizeof cnt->n, tokid);
 
       lex_get ();
       if (!lex_force_match ('='))
@@ -349,7 +352,7 @@ parse_string_criteria (struct counting * c)
       cur = &c->crit.s[n++];
       cur->type = CNT_SINGLE;
       cur->s = malloc (len + 1);
-      st_pad_copy (cur->s, ds_c_str (&tokstr), len + 1);
+      str_copy_rpad (cur->s, len + 1, ds_c_str (&tokstr));
       lex_get ();
 
       lex_match (',');
@@ -382,7 +385,7 @@ count_numeric (struct counting * cnt, struct ccase * c)
 	    counter++;
 	  continue;
 	}
-      if (cnt->missing >= 2 && is_num_user_missing (cmp, cnt->v[i]))
+      if (cnt->missing >= 2 && mv_is_num_user_missing (&cnt->v[i]->miss, cmp))
 	{
 	  counter++;
 	  continue;