From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 27 May 2018 00:50:20 +0000 (-0700)
Subject: data-out: Clarify the meaning of the 'encoding' parameter.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95c2bfafa6dc104e3048b9d8106231aaecb8659b;p=pspp

data-out: Clarify the meaning of the 'encoding' parameter.

Signed-off-by: Ben Pfaff <blp@cs.stanford.edu>
---

diff --git a/src/data/data-out.c b/src/data/data-out.c
index c6e793bd71..cb21600a72 100644
--- a/src/data/data-out.c
+++ b/src/data/data-out.c
@@ -157,21 +157,21 @@ binary_to_utf8 (const char *in, struct pool *pool)
    VALUE must be the correct width for FORMAT, that is, its width must be
    fmt_var_width(FORMAT).
 
-   ENCODING must be the encoding of INPUT.  Normally this can be obtained by
-   calling dict_get_encoding() on the dictionary with which INPUT is
-   associated.  ENCODING is only important when FORMAT's type is FMT_A.
+   INPUT_ENCODING must be the encoding of INPUT.  Normally this can be obtained
+   by calling dict_get_encoding() on the dictionary with which INPUT is
+   associated.  INPUT_ENCODING is only important when FORMAT's type is FMT_A.
 
    The return value is dynamically allocated, and must be freed by the caller.
    If POOL is non-null, then the return value is allocated on that pool.  */
 char *
-data_out_pool (const union value *input, const char *encoding,
+data_out_pool (const union value *input, const char *input_encoding,
 	       const struct fmt_spec *format, struct pool *pool)
 {
   assert (fmt_check_output (format));
   if (format->type == FMT_A)
     {
       char *in = CHAR_CAST (char *, value_str (input, format->w));
-      return recode_string_pool (UTF8, encoding, in, format->w, pool);
+      return recode_string_pool (UTF8, input_encoding, in, format->w, pool);
     }
   else if (fmt_get_category (format->type) == FMT_CAT_BINARY)
     {
@@ -224,9 +224,10 @@ data_out_stretchy (const union value *input, const char *encoding,
 }
 
 char *
-data_out (const union value *input, const char *encoding, const struct fmt_spec *format)
+data_out (const union value *input, const char *input_encoding,
+          const struct fmt_spec *format)
 {
-  return data_out_pool (input, encoding, format, NULL);
+  return data_out_pool (input, input_encoding, format, NULL);
 }
 
 
diff --git a/src/data/data-out.h b/src/data/data-out.h
index b18d067436..65ac60544f 100644
--- a/src/data/data-out.h
+++ b/src/data/data-out.h
@@ -25,11 +25,14 @@ struct fmt_spec;
 struct string;
 union value;
 
-char * data_out (const union value *, const char *encoding, const struct fmt_spec *);
+char *data_out (const union value *input, const char *input_encoding,
+                const struct fmt_spec *);
 
-char * data_out_pool (const union value *, const char *encoding, const struct fmt_spec *, struct pool *pool);
+char *data_out_pool (const union value *input, const char *input_encoding,
+                     const struct fmt_spec *, struct pool *pool);
 
-char *data_out_stretchy (const union value *, const char *encoding, const struct fmt_spec *, struct pool *);
+char *data_out_stretchy (const union value *input, const char *input_encoding,
+                         const struct fmt_spec *, struct pool *);
 
 void data_out_recode (const union value *input, const char *input_encoding,
                       const struct fmt_spec *,