PDCLIB-2 PDCLIB-12 tighten up restrict qualifiers on codec interface

diff --git a/internals/_PDCLIB_encoding.h b/internals/_PDCLIB_encoding.h
index 0b466c150a291789fe3a6deb7335dca59935e4af..f53d77ab9e9bc67193833bac076766004794481b 100644 (file)
--- a/internals/_PDCLIB_encoding.h
+++ b/internals/_PDCLIB_encoding.h
@@ -102,19 +102,19 @@ struct _PDCLIB_charcodec {
     /* UCS-4 variants. Mandatory. */
 
     _PDCLIB_bool (*__mbstoc32s)(
-        _PDCLIB_char32_t       **_PDCLIB_restrict   _P_outbuf,
-        _PDCLIB_size_t          *_PDCLIB_restrict   _P_outsz,
-        const char             **_PDCLIB_restrict   _P_inbuf,
-        _PDCLIB_size_t          *_PDCLIB_restrict   _P_insz,
-        _PDCLIB_mbstate_t       *_PDCLIB_restrict   _P_ps
+        _PDCLIB_char32_t       *_PDCLIB_restrict *_PDCLIB_restrict   _P_outbuf,
+        _PDCLIB_size_t                           *_PDCLIB_restrict   _P_outsz,
+        const char             *_PDCLIB_restrict *_PDCLIB_restrict   _P_inbuf,
+        _PDCLIB_size_t                           *_PDCLIB_restrict   _P_insz,
+        _PDCLIB_mbstate_t                        *_PDCLIB_restrict   _P_ps
     );
 
     _PDCLIB_bool (*__c32stombs)(
-        char                   **_PDCLIB_restrict  _P_outbuf,
-        _PDCLIB_size_t          *_PDCLIB_restrict  _P_outsz,
-        const _PDCLIB_char32_t **_PDCLIB_restrict  _P_inbuf,
-        _PDCLIB_size_t          *_PDCLIB_restrict  _P_insz,
-        _PDCLIB_mbstate_t       *_PDCLIB_restrict  _P_ps
+        char                   *_PDCLIB_restrict *_PDCLIB_restrict  _P_outbuf,
+        _PDCLIB_size_t                           *_PDCLIB_restrict  _P_outsz,
+        const _PDCLIB_char32_t *_PDCLIB_restrict *_PDCLIB_restrict  _P_inbuf,
+        _PDCLIB_size_t                           *_PDCLIB_restrict  _P_insz,
+        _PDCLIB_mbstate_t                        *_PDCLIB_restrict  _P_ps
     );
 
     /* UTF-16 variants; same as above except optional. 
@@ -124,19 +124,19 @@ struct _PDCLIB_charcodec {
      */
 
     _PDCLIB_bool (*__mbstoc16s)(
-        _PDCLIB_char16_t       **_PDCLIB_restrict   _P_outbuf,
-        _PDCLIB_size_t          *_PDCLIB_restrict   _P_outsz,
-        const char             **_PDCLIB_restrict   _P_inbuf,
-        _PDCLIB_size_t          *_PDCLIB_restrict   _P_insz,
-        _PDCLIB_mbstate_t       *_PDCLIB_restrict   _P_ps
+        _PDCLIB_char16_t       *_PDCLIB_restrict *_PDCLIB_restrict   _P_outbuf,
+        _PDCLIB_size_t                           *_PDCLIB_restrict   _P_outsz,
+        const char             *_PDCLIB_restrict *_PDCLIB_restrict   _P_inbuf,
+        _PDCLIB_size_t                           *_PDCLIB_restrict   _P_insz,
+        _PDCLIB_mbstate_t                        *_PDCLIB_restrict   _P_ps
     );
 
     _PDCLIB_bool (*__c16stombs)(
-        char                   **_PDCLIB_restrict  _P_outbuf,
-        _PDCLIB_size_t          *_PDCLIB_restrict  _P_outsz,
-        const _PDCLIB_char16_t **_PDCLIB_restrict  _P_inbuf,
-        _PDCLIB_size_t          *_PDCLIB_restrict  _P_insz,
-        _PDCLIB_mbstate_t       *_PDCLIB_restrict  _P_ps
+        char                   *_PDCLIB_restrict *_PDCLIB_restrict  _P_outbuf,
+        _PDCLIB_size_t                           *_PDCLIB_restrict  _P_outsz,
+        const _PDCLIB_char16_t *_PDCLIB_restrict *_PDCLIB_restrict  _P_inbuf,
+        _PDCLIB_size_t                           *_PDCLIB_restrict  _P_insz,
+        _PDCLIB_mbstate_t                        *_PDCLIB_restrict  _P_ps
     );
 };
 

diff --git a/opt/basecodecs/_PDCLIB_ascii.c b/opt/basecodecs/_PDCLIB_ascii.c
index e84563f747a68b7a50ed8b3a3dfc63f6e3322dcc..d178a54575e90b236618510c922e8be199daad50 100644 (file)
--- a/opt/basecodecs/_PDCLIB_ascii.c
+++ b/opt/basecodecs/_PDCLIB_ascii.c
@@ -10,11 +10,11 @@
 #include <_PDCLIB_encoding.h>
 
 static bool asciitoc32(
-    char32_t       **restrict   p_outbuf,
-    size_t          *restrict   p_outsz,
-    const char     **restrict   p_inbuf,
-    size_t          *restrict   p_insz,
-    mbstate_t       *restrict   p_ps
+    char32_t       *restrict *restrict   p_outbuf,
+    size_t                   *restrict   p_outsz,
+    const char     *restrict *restrict   p_inbuf,
+    size_t                   *restrict   p_insz,
+    mbstate_t                *restrict   p_ps
 )
 {
     while(*p_outsz && *p_insz) {
@@ -35,11 +35,11 @@ static bool asciitoc32(
 }
 
 static bool c32toascii(
-    char           **restrict  p_outbuf,
-    size_t          *restrict  p_outsz,
-    const char32_t **restrict  p_inbuf,
-    size_t          *restrict  p_insz,
-    mbstate_t       *restrict  p_ps
+    char           *restrict *restrict  p_outbuf,
+    size_t                   *restrict  p_outsz,
+    const char32_t *restrict *restrict  p_inbuf,
+    size_t                   *restrict  p_insz,
+    mbstate_t                *restrict  p_ps
 )
 {
     while(*p_outsz && *p_insz) {

diff --git a/opt/basecodecs/_PDCLIB_latin1.c b/opt/basecodecs/_PDCLIB_latin1.c
index 29903606db810648ad2a9b19cbd6bfc3c6945c69..cec13a017e88ef00b3540636e8a0d4fac5da19d9 100644 (file)
--- a/opt/basecodecs/_PDCLIB_latin1.c
+++ b/opt/basecodecs/_PDCLIB_latin1.c
@@ -10,11 +10,11 @@
 #include <_PDCLIB_encoding.h>
 
 static bool latin1toc32(
-    char32_t       **restrict   p_outbuf,
-    size_t          *restrict   p_outsz,
-    const char     **restrict   p_inbuf,
-    size_t          *restrict   p_insz,
-    mbstate_t       *restrict   p_ps
+    char32_t       *restrict *restrict   p_outbuf,
+    size_t                   *restrict   p_outsz,
+    const char     *restrict *restrict   p_inbuf,
+    size_t                   *restrict   p_insz,
+    mbstate_t                *restrict   p_ps
 )
 {
     while(*p_outsz && *p_insz) {
@@ -33,11 +33,11 @@ static bool latin1toc32(
 }
 
 static bool c32tolatin1(
-    char           **restrict  p_outbuf,
-    size_t          *restrict  p_outsz,
-    const char32_t **restrict  p_inbuf,
-    size_t          *restrict  p_insz,
-    mbstate_t       *restrict  p_ps
+    char           *restrict *restrict  p_outbuf,
+    size_t                   *restrict  p_outsz,
+    const char32_t *restrict *restrict  p_inbuf,
+    size_t                   *restrict  p_insz,
+    mbstate_t                *restrict  p_ps
 )
 {
     while(*p_outsz && *p_insz) {

diff --git a/opt/basecodecs/_PDCLIB_utf8.c b/opt/basecodecs/_PDCLIB_utf8.c
index 65f76e01470ba3c337382e15c322e847531ffd6d..b0d3413e696d7489f3d6b5b2f7f6968a3f8da240 100644 (file)
--- a/opt/basecodecs/_PDCLIB_utf8.c
+++ b/opt/basecodecs/_PDCLIB_utf8.c
@@ -56,11 +56,11 @@ end_conversion:             \
     do { if((c & 0xC0) != 0x80) return false; } while(0)
 
 static bool utf8toc32(
-    char32_t       **restrict   p_outbuf,
-    size_t          *restrict   p_outsz,
-    const char     **restrict   p_inbuf,
-    size_t          *restrict   p_insz,
-    mbstate_t       *restrict   p_s
+    char32_t       *restrict *restrict   p_outbuf,
+    size_t                   *restrict   p_outsz,
+    const char     *restrict *restrict   p_inbuf,
+    size_t                   *restrict   p_insz,
+    mbstate_t                *restrict   p_s
 )
 {
     START_CONVERSION
@@ -165,11 +165,11 @@ enum {
 };
 
 static bool c32toutf8(
-    char           **restrict  p_outbuf,
-    size_t          *restrict  p_outsz,
-    const char32_t **restrict  p_inbuf,
-    size_t          *restrict  p_insz,
-    mbstate_t       *restrict  p_s
+    char           *restrict *restrict  p_outbuf,
+    size_t                   *restrict  p_outsz,
+    const char32_t *restrict *restrict  p_inbuf,
+    size_t                   *restrict  p_insz,
+    mbstate_t                *restrict  p_s
 )
 {
     START_CONVERSION