X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=opt%2Fbasecodecs%2F_PDCLIB_latin1.c;h=b397001303921c93f99854aa9ed02da5128e40db;hb=ed01ab8d9fcc47f6a4089ef72a73ef7a084d1ed3;hp=73844f417b6aa32587cf5f1e03346d6330d0e0e1;hpb=d70d75f5f46047f7546b14f424cccad7316bff6a;p=pdclib.old

diff --git a/opt/basecodecs/_PDCLIB_latin1.c b/opt/basecodecs/_PDCLIB_latin1.c
index 73844f4..b397001 100644
--- a/opt/basecodecs/_PDCLIB_latin1.c
+++ b/opt/basecodecs/_PDCLIB_latin1.c
@@ -7,21 +7,25 @@
 #include <stdbool.h>
 #ifndef REGTEST
 #include <uchar.h>
+#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) {
         unsigned char c = **p_inbuf;
-        **p_outbuf = c;
+
+        if(p_outbuf) {
+            **p_outbuf = c;
+            (*p_outbuf)++; 
+        }
 
         (*p_inbuf)++;
-        (*p_outbuf)++; 
         (*p_insz)--; 
         (*p_outsz)--;
     }
@@ -29,26 +33,35 @@ 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) {
         char32_t c = **p_inbuf;
         if(c > 255)
             return false;
-        **p_outbuf = c;
+
+        if(p_outbuf) {
+            **p_outbuf = c;
+            (*p_outbuf)++;
+        }
 
         (*p_inbuf)++;
-        (*p_outbuf)++; 
         (*p_insz)--; 
         (*p_outsz)--;        
     }
     return true;
 }
+
+struct _PDCLIB_charcodec _PDCLIB_latin1_codec = {
+    .__mbstoc32s = latin1toc32,
+    .__c32stombs = c32tolatin1,
+};
+
 #endif
 
 #ifdef TEST