aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeng Haitao <penght@cn.fujitsu.com>2014-10-14 15:39:57 +0800
committerMichael Kerrisk <mtk.manpages@gmail.com>2015-02-27 14:44:29 +0100
commita353619d6698769f43536ca6aa0e42f5924514fa (patch)
tree5885a68a5f62d65adb29f33674ac8016921f6633
parent7236d18fbf7216b1558cf527ab2b09f4ca63939c (diff)
downloadman-pages-a353619d6698769f43536ca6aa0e42f5924514fa.tar.gz
iconv.3: Modify thread-safety information
Signed-off-by: Peng Haitao <penght@cn.fujitsu.com> Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
-rw-r--r--man3/iconv.310
-rw-r--r--man3/iconv_open.32
2 files changed, 8 insertions, 4 deletions
diff --git a/man3/iconv.3 b/man3/iconv.3
index 0dfcd7d140..7a8d785049 100644
--- a/man3/iconv.3
+++ b/man3/iconv.3
@@ -140,7 +140,6 @@ An incomplete multibyte sequence has been encountered in the input.
.SH VERSIONS
This function is available in glibc since version 2.1.
.SH ATTRIBUTES
-.SS Multithreading (see pthreads(7))
For an explanation of the terms used in this section, see
.BR attributes (7).
.TS
@@ -150,8 +149,15 @@ l l l.
Interface Attribute Value
T{
.BR iconv ()
-T} Thread safety MT-Safe
+T} Thread safety MT-Safe race:cd
.TE
+.PP
+The
+.BR iconv ()
+function is MT-Safe, as long as callers arrange for
+mutual exclusion on the
+.I cd
+argument.
.SH CONFORMING TO
POSIX.1-2001.
.SH NOTES
diff --git a/man3/iconv_open.3 b/man3/iconv_open.3
index 40ceeec8f8..61845ae6e4 100644
--- a/man3/iconv_open.3
+++ b/man3/iconv_open.3
@@ -76,8 +76,6 @@ the state is in the initial state.
Using
.BR iconv (3)
modifies the descriptor's conversion state.
-(This implies that a conversion
-descriptor can not be used in multiple threads simultaneously.)
To bring the state back to the initial state, use
.BR iconv (3)
with NULL as