X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fxforms%2Frecode.c;h=94c5e4c7f220873858700de101462f075b8f1a2d;hb=33cdbdf7e095370cf04240eed21344205a487191;hp=361b5a64f867b27b20d4f69c1c7d968b3c79280d;hpb=6e097c89af440da90b43ce90864394c4d0c843d5;p=pspp

diff --git a/src/language/xforms/recode.c b/src/language/xforms/recode.c
index 361b5a64f8..94c5e4c7f2 100644
--- a/src/language/xforms/recode.c
+++ b/src/language/xforms/recode.c
@@ -158,7 +158,7 @@ cmd_recode (struct lexer *lexer, struct dataset *ds)
          as the widest destination variable. */
       if (trns->dst_type == VAL_STRING)
 	{
-	  if ( ! enlarge_dst_widths (trns))
+	  if (! enlarge_dst_widths (trns))
 	    {
 	      recode_trns_free (trns);
 	      return CMD_FAILURE;
@@ -452,7 +452,7 @@ set_map_out_str (struct map_out *out, struct pool *pool,
 
   out->copy_input = false;
   value_init_pool (pool, &out->value, length);
-  memcpy (value_str_rw (&out->value, length), string, length);
+  memcpy (out->value.s, string, length);
   out->width = length;
 }
 
@@ -656,8 +656,7 @@ find_src_string (struct recode_trns *trns, const uint8_t *value,
       switch (in->type)
         {
         case MAP_SINGLE:
-          match = !memcmp (value, value_str (&in->x, trns->max_src_width),
-                           width);
+          match = !memcmp (value, in->x.s, width);
           break;
         case MAP_ELSE:
           match = true;
@@ -722,8 +721,7 @@ recode_trns_proc (void *trns_, struct ccase **c, casenumber case_idx UNUSED)
           if (out != NULL)
             {
               if (!out->copy_input)
-                memcpy (dst, value_str (&out->value, trns->max_dst_width),
-                        var_get_width (dst_var));
+                memcpy (dst, out->value.s, var_get_width (dst_var));
               else if (trns->src_vars != trns->dst_vars)
                 {
                   union value *dst_data = case_data_rw (*c, dst_var);