aboutsummaryrefslogtreecommitdiff
path: root/src/include/gnunet_strings_lib.h
diff options
context:
space:
mode:
authorMartin Schanzenbach <mschanzenbach@posteo.de>2020-06-21 15:56:41 +0200
committerMartin Schanzenbach <mschanzenbach@posteo.de>2020-06-21 15:56:41 +0200
commitd6d7bf7df8e6ff09aa470b4334b9418646c617b5 (patch)
tree553ffbacab64cb729933225ab05f7a47353f28b6 /src/include/gnunet_strings_lib.h
parent8af55509fc6f7a411ff2dbc5e8ccde5489290b20 (diff)
parent79fa977314009e631112918cce3eb0f0d5f296d7 (diff)
downloadgnunet-d6d7bf7df8e6ff09aa470b4334b9418646c617b5.tar.gz
gnunet-d6d7bf7df8e6ff09aa470b4334b9418646c617b5.zip
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src/include/gnunet_strings_lib.h')
-rw-r--r--src/include/gnunet_strings_lib.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h
index 4003590fc..663b44194 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -120,7 +120,8 @@ GNUNET_STRINGS_byte_size_fancy (unsigned long long size);
120 * string is returned. 120 * string is returned.
121 */ 121 */
122char * 122char *
123GNUNET_STRINGS_conv (const char *input, size_t len, 123GNUNET_STRINGS_conv (const char *input,
124 size_t len,
124 const char *input_charset, 125 const char *input_charset,
125 const char *output_charset); 126 const char *output_charset);
126 127