From 55ccaea4a5b6236f31169aedb30fd19eeef2f532 Mon Sep 17 00:00:00 2001
From: Martin Ettl <ettl.martin78@googlemail.com>
Date: Mon, 21 Sep 2015 13:40:56 +0200
Subject: [PATCH] std.cfg: Added more functions from <cuchar> and corresponding
 test cases.

---
 cfg/std.cfg    | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++
 test/cfg/std.c | 39 +++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+)

diff --git a/cfg/std.cfg b/cfg/std.cfg
index 037400bb1..289414b46 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -3871,6 +3871,72 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- size_t c16rtomb ( char * pmb, char16_t c16, mbstate_t * ps ); -->
+  <function name="c16rtomb">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- size_t c32rtomb ( char * pmb, char32_t c32, mbstate_t * ps ); -->
+  <function name="c32rtomb">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- size_t mbrtoc16 ( char16_t * pc16, const char * pmb, size_t max, mbstate_t * ps); -->
+  <function name="mbrtoc16">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
+    <arg nr="4">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- size_t mbrtoc32 ( char32_t * pc32, const char * pmb, size_t max, mbstate_t * ps); -->
+  <function name="mbrtoc32">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
+    <arg nr="4">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
   <!-- Not part of standard, but widely supported by runtime libraries. -->
   <!-- char * itoa (int value, char * str, int base); -->
   <function name="itoa">
diff --git a/test/cfg/std.c b/test/cfg/std.c
index 6dae1bd2f..9ab96e57d 100644
--- a/test/cfg/std.c
+++ b/test/cfg/std.c
@@ -12,6 +12,7 @@
 #include <stdlib.h>
 #include <tgmath.h> // frexp
 #include <wchar.h>
+#include <uchar.h>
 #include <wctype.h>
 #include <fenv.h>
 #include <setjmp.h>
@@ -3384,6 +3385,44 @@ void uninitvar_itoa(void)
     (void)itoa(value,str,base);
 }
 
+void uninivar_c16rtomb(void)
+{
+    char * pmb;
+    char16_t c16;
+    mbstate_t * ps;
+    // cppcheck-suppress uninitvar
+    (void)c16rtomb(pmb,c16,ps);
+}
+
+void uninivar_c32rtomb(void)
+{
+    char * pmb;
+    char32_t c32;
+    mbstate_t * ps;
+    // cppcheck-suppress uninitvar
+    (void)c32rtomb(pmb,c32,ps);
+}
+
+void uninivar_mbrtoc16(void)
+{
+    char16_t * pc16;
+    char * pmb;
+    size_t max;
+    mbstate_t * ps;
+    // cppcheck-suppress uninitvar
+    (void)mbrtoc16(pc16,pmb,max,ps);
+}
+
+void uninivar_mbrtoc32(void)
+{
+    char32_t * pc32;
+    char * pmb;
+    size_t max;
+    mbstate_t * ps;
+    // cppcheck-suppress uninitvar
+    (void)mbrtoc32(pc32,pmb,max,ps);
+}
+
 void invalidFunctionArgBool_abs(bool b, double x, double y)
 {
     // cppcheck-suppress invalidFunctionArgBool