X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fmrsets.c;h=3b96da3a6ceab28a7177416386bcef1d22ca87fa;hb=f42cd385428298f9ee9795a3296e32363a9b0baa;hp=97ab2c1fb4ffdded42110f9812ef73d3454a777b;hpb=5cab4cf3322f29c0ed7134d23740e07382914f20;p=pspp

diff --git a/src/language/dictionary/mrsets.c b/src/language/dictionary/mrsets.c
index 97ab2c1fb4..3b96da3a6c 100644
--- a/src/language/dictionary/mrsets.c
+++ b/src/language/dictionary/mrsets.c
@@ -79,11 +79,10 @@ parse_group (struct lexer *lexer, struct dictionary *dict,
              enum mrset_type type)
 {
   const char *subcommand_name = type == MRSET_MD ? "MDGROUP" : "MCGROUP";
-  struct mrset *mrset;
   bool labelsource_varlabel;
   bool has_value;
 
-  mrset = xzalloc (sizeof *mrset);
+  struct mrset *mrset = XZALLOC (struct mrset);
   mrset->type = type;
   mrset->cat_source = MRSET_VARLABELS;
 
@@ -170,7 +169,7 @@ parse_group (struct lexer *lexer, struct dictionary *dict,
 
               value_destroy (&mrset->counted, mrset->width);
               value_init (&mrset->counted, width);
-              memcpy (value_str_rw (&mrset->counted, width), s, width);
+              memcpy (mrset->counted.s, s, width);
               mrset->width = width;
 
               free (s);
@@ -421,7 +420,8 @@ parse_group (struct lexer *lexer, struct dictionary *dict,
                       if (!c->warned && utf8_strcasecmp (c->label, label))
                         {
                           char *s = data_out (value, var_get_encoding (var),
-                                              var_get_print_format (var));
+                                              var_get_print_format (var),
+                                              settings_get_fmt_settings ());
                           c->warned = true;
                           msg (SW, _("Variables specified on MCGROUP should "
                                      "have the same categories, but %s and %s "