32 files changed, 111 insertions, 99 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7ad588f..7024d1f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -209,6 +209,10 @@
 * Rename implementation file directory: imp => det;
 * Fix *fil functions;
 
+* Bring back restr (as rsr and private);
+* Fix text paddings;
+* Fix utf32srh
+
 # 0.0.2
 
 * Migrate to CMake;
diff --git a/zp/GNUmakefile b/zp/GNUmakefile
index fbb4788..c0c2099 100644
--- a/zp/GNUmakefile
+++ b/zp/GNUmakefile
@@ -37,7 +37,7 @@ OBJ_MTH_ISNAN := source/any/mth/isnan.o
 #OBJ_MTH_VADD := source/any/mth/vadd.o
 #OBJ_MTH_VSUB := source/any/mth/vsub.o
 
-OBJ_STR_FMT := source/any/str/fmt.o
+#OBJ_STR_FMT := source/any/str/fmt.o
 OBJ_STR_STRCPY := source/any/str/strcpy.o
 OBJ_STR_STREQU := source/any/str/strequ.o
 OBJ_STR_STRFIL := source/any/str/strfil.o
diff --git a/zp/include/zp/mem b/zp/include/zp/mem
index 57deaa3..de841f7 100644
--- a/zp/include/zp/mem
+++ b/zp/include/zp/mem
@@ -16,11 +16,11 @@ namespace zp {
 srctyp * src;
 };
 
- template<typename dsttyp,typename srctyp> zp_iln zp_nothw inline ::zp::cpyres<dsttyp,srctyp> memcpy(dsttyp * dst, srctyp const* src, ::zp::siz const num);
- template<typename ltyp, typename rtyp> zp_useres zp_iln zp_nothw inline bool memequ(ltyp const* lbuf,rtyp const* rbuf,::zp::siz const num) {return ::zp_memequ(lbuf,rbuf,num);}
- template<typename typ> zp_iln zp_nothw inline typ * memfil(typ * dst, char unsigned val, ::zp::siz const num) {return static_cast<typ *>(::zp_memfil(dst,val,num));}
- template<typename typ> zp_useres zp_nothw zp_iln inline typ * memsrh(typ * buf, char unsigned val, ::zp::siz const num) {return static_cast<typ *>(::zp_memsrh(buf,val,num));}
- template<typename typ> zp_useres zp_nothw zp_iln inline typ const* memsrh(typ const* buf, char unsigned val, ::zp::siz const num) {return const_cast<typ const*>(static_cast<typ *>(::zp_memsrh(buf,val,num)));}
+ template<typename dsttyp,typename srctyp> zp_iln zp_nothw inline ::zp::cpyres<dsttyp,srctyp> memcpy(dsttyp * zp_prv_rsr dst, srctyp const* zp_prv_rsr src, ::zp::siz const num); // Implement in seperate file.
+ template<typename ltyp, typename rtyp> zp_useres zp_iln zp_nothw inline bool memequ(ltyp const* zp_prv_rsr lbuf,rtyp const* zp_prv_rsr rbuf,::zp::siz const num) {return ::zp_memequ(lbuf,rbuf,num);}
+ template<typename typ> zp_iln zp_nothw inline typ * memfil(typ * zp_prv_rsr dst, char unsigned val, ::zp::siz const num) {return static_cast<typ *>(::zp_memfil(dst,val,num));}
+ template<typename typ> zp_useres zp_nothw zp_iln inline typ * memsrh(typ * zp_prv_rsr buf, char unsigned val, ::zp::siz const num) {return static_cast<typ *>(::zp_memsrh(buf,val,num));}
+ template<typename typ> zp_useres zp_nothw zp_iln inline typ const* memsrh(typ const* zp_prv_rsr buf, char unsigned val, ::zp::siz const num) {return const_cast<typ const*>(static_cast<typ *>(::zp_memsrh(buf,val,num)));}
 
 #if zp_std_cxx11
 template<typename ltyp, typename rtyp> constexpr auto cpy(ltyp * dst, rtyp * src, ::zp::siz num) noexcept -> ::zp::cpyres<ltyp,rtyp>;
diff --git a/zp/include/zp/mem.h b/zp/include/zp/mem.h
index 84a2801..c2aa5c9 100644
--- a/zp/include/zp/mem.h
+++ b/zp/include/zp/mem.h
@@ -16,10 +16,10 @@ typedef struct {
 void * src;
 } zp_cpyres;
 
-zp_nothw zp_cpyres zp_memcpy(void * dst, void const* src, zp_siz num);
-zp_nothw zp_useres bool zp_memequ(void const* lbuf,void const* rbuf,zp_siz num);
-zp_nothw void * zp_memfil(void * dst, char unsigned val, zp_siz num);
-zp_nothw zp_useres void * zp_memsrh(void const* buf, char unsigned val, zp_siz num);
+zp_nothw zp_cpyres zp_memcpy(void * zp_prv_rsr dst, void const* zp_prv_rsr src, zp_siz num);
+zp_nothw zp_useres bool zp_memequ(void const* zp_prv_rsr lbuf,void const* zp_prv_rsr rbuf,zp_siz num);
+zp_nothw void * zp_memfil(void * zp_prv_rsr dst, char unsigned val, zp_siz num);
+zp_nothw zp_useres void * zp_memsrh(void const* zp_prv_rsr buf, char unsigned val, zp_siz num);
 
 zp_prv_cdeclend
 
diff --git a/zp/include/zp/str b/zp/include/zp/str
index b062e3d..ec4d09e 100644
--- a/zp/include/zp/str
+++ b/zp/include/zp/str
@@ -15,40 +15,38 @@ namespace zp {
 template<typename typ> zp_nothw zp_useres ::zp::siz numdig(typ val,::zp::i8 bs);
 }
 
- zp_iln zp_nothw inline ::zp::siz strcpy(char * dst, char const* src) {return ::zp_strcpy(dst,src);}
- zp_iln zp_nothw zp_useres inline bool strequ(char const* lstr,char const* rstr) {return ::zp_strequ(lstr,rstr);}
- zp_iln zp_nothw zp_useres inline ::zp::siz strfil(char * str,char chr) {return ::zp_strfil(str,chr);}
- zp_iln zp_nothw inline ::zp::siz strlen(char const* str) {return ::zp_strlen(str);}
- zp_iln zp_nothw zp_useres inline char * strsrh(char * str, char chr) {return ::zp_strsrh(str,chr);}
- zp_iln zp_nothw zp_useres inline char const* strsrh(char const* str, char chr) {return const_cast<char const*>(::zp_strsrh(str,chr));}
-
- zp_iln zp_nothw inline ::zp::siz wstrcpy(wchar_t * dst, wchar_t const* src) {return ::zp_wstrcpy(dst,src);}
- zp_iln zp_nothw zp_useres inline bool wstrequ(wchar_t const* lstr,wchar_t const* rstr) {return ::zp_wstrequ(lstr,rstr);}
- zp_iln zp_nothw zp_useres inline ::zp::siz wstrfil(wchar_t * str,wchar_t chr) {return ::zp_wstrfil(str,chr);}
- zp_iln zp_nothw inline ::zp::siz wstrlen(wchar_t const* str) {return ::zp_wstrlen(str);}
- zp_iln zp_nothw zp_useres inline wchar_t * wstrsrh(wchar_t * str, wchar_t chr) {return ::zp_wstrsrh(str,chr);}
- zp_iln zp_nothw zp_useres inline wchar_t const* wstrsrh(wchar_t const* str, wchar_t chr) {return const_cast<wchar_t const*>(::zp_wstrsrh(str,chr));}
-
- zp_iln zp_nothw inline ::zp::siz utf32cpy(::zp::c02 * dst, ::zp::c02 const* src) {return ::zp_utf32cpy(dst,src);}
- zp_iln zp_nothw zp_useres inline bool utf32equ(::zp::c02 const* lstr,::zp::c02 const* rstr) {return ::zp_utf32equ(lstr,rstr);}
- zp_iln zp_nothw zp_useres inline ::zp::siz utf32fil(::zp::c02 * str, ::zp::c02 chr) {return ::zp_utf32fil(str,chr);}
- zp_iln zp_nothw inline ::zp::siz utf32len(::zp::c02 const* str) {return ::zp_utf32len(str);}
- zp_iln zp_nothw zp_useres inline ::zp::c02 * utf32srh(::zp::c02 str, ::zp::c02 chr) {return ::zp_utf32srh(str,chr);}
- zp_iln zp_nothw zp_useres inline ::zp::c02 const* utf32srh(::zp::c02 const* str, ::zp::c02 chr) {return const_cast< ::zp::c02 const*>(::zp_utf32srh(str,chr));}
-
- zp_iln zp_nothw zp_useres inline ::zp::siz utf8enclen( ::zp::c02 const* str) {return ::zp_utf8enclen(str);}
- zp_iln zp_nothw zp_useres inline ::zp::siz utf8declen( ::zp::c8 const* str) {return ::zp_utf8declen(str);}
- zp_iln zp_nothw zp_useres inline ::zp::siz utf16enclen(::zp::c02 const* str) {return ::zp_utf16enclen(str);}
- zp_iln zp_nothw zp_useres inline ::zp::siz utf16declen(::zp::c01 const* str) {return ::zp_utf16declen(str);}
-
- zp_iln zp_nothw inline void utf8enc( ::zp::c8 * dst,::zp::c02 const* src) {return ::zp_utf8enc(dst,src);}
- zp_iln zp_nothw inline void utf8dec( ::zp::c02 * dst,::zp::c8 const* src) {return ::zp_utf8dec(dst,src);}
- zp_iln zp_nothw inline void utf16enc( ::zp::c01 * dst,::zp::c02 const* src) {return ::zp_utf16enc(dst,src);}
- zp_iln zp_nothw inline void utf16dec( ::zp::c02 * dst,::zp::c01 const* src) {return ::zp_utf16dec(dst,src);}
- zp_iln zp_nothw inline void win1252enc(::zp::c8 * dst,::zp::c02 const* src) {return ::zp_win1252enc(dst,src);}
- zp_iln zp_nothw inline void win1252dec(::zp::c02 * dst,::zp::c8 const* src) {return ::zp_win1252dec(dst,src);}
-
- //template<typename typ> zp_nothw zp_useres ::zp::siz fmtlen(typ val,::zp::i8 bs); /* Including (potential) decorations. */
+ zp_iln zp_nothw inline ::zp::siz strcpy(char * zp_prv_rsr dst, char const* zp_prv_rsr src) {return ::zp_strcpy(dst,src);}
+ zp_iln zp_nothw zp_useres inline bool strequ(char const* zp_prv_rsr lstr,char const* zp_prv_rsr rstr) {return ::zp_strequ(lstr,rstr);}
+ zp_iln zp_nothw zp_useres inline ::zp::siz strfil(char * zp_prv_rsr str,char chr) {return ::zp_strfil(str,chr);}
+ zp_iln zp_nothw inline ::zp::siz strlen(char const* zp_prv_rsr str) {return ::zp_strlen(str);}
+ zp_iln zp_nothw zp_useres inline char * strsrh(char * zp_prv_rsr str, char chr) {return ::zp_strsrh(str,chr);}
+ zp_iln zp_nothw zp_useres inline char const* strsrh(char const* zp_prv_rsr str, char chr) {return const_cast<char const*>(::zp_strsrh(str,chr));}
+
+ zp_iln zp_nothw inline ::zp::siz wstrcpy(wchar_t * zp_prv_rsr dst, wchar_t const* zp_prv_rsr src) {return ::zp_wstrcpy(dst,src);}
+ zp_iln zp_nothw zp_useres inline bool wstrequ(wchar_t const* zp_prv_rsr lstr,wchar_t const* zp_prv_rsr rstr) {return ::zp_wstrequ(lstr,rstr);}
+ zp_iln zp_nothw zp_useres inline ::zp::siz wstrfil(wchar_t * zp_prv_rsr str,wchar_t chr) {return ::zp_wstrfil(str,chr);}
+ zp_iln zp_nothw inline ::zp::siz wstrlen(wchar_t const* zp_prv_rsr str) {return ::zp_wstrlen(str);}
+ zp_iln zp_nothw zp_useres inline wchar_t * wstrsrh(wchar_t * zp_prv_rsr str, wchar_t chr) {return ::zp_wstrsrh(str,chr);}
+ zp_iln zp_nothw zp_useres inline wchar_t const* wstrsrh(wchar_t const* zp_prv_rsr str, wchar_t chr) {return const_cast<wchar_t const*>(::zp_wstrsrh(str,chr));}
+
+ zp_iln zp_nothw inline ::zp::siz utf32cpy(::zp::c02 * zp_prv_rsr dst, ::zp::c02 const* zp_prv_rsr src) {return ::zp_utf32cpy(dst,src);}
+ zp_iln zp_nothw zp_useres inline bool utf32equ(::zp::c02 const* zp_prv_rsr lstr,::zp::c02 const* zp_prv_rsr rstr) {return ::zp_utf32equ(lstr,rstr);}
+ zp_iln zp_nothw zp_useres inline ::zp::siz utf32fil(::zp::c02 * zp_prv_rsr str, ::zp::c02 chr) {return ::zp_utf32fil(str,chr);}
+ zp_iln zp_nothw inline ::zp::siz utf32len(::zp::c02 const* zp_prv_rsr str) {return ::zp_utf32len(str);}
+ zp_iln zp_nothw zp_useres inline ::zp::c02 * utf32srh(::zp::c02 * zp_prv_rsr str, ::zp::c02 chr) {return ::zp_utf32srh(str,chr);}
+ zp_iln zp_nothw zp_useres inline ::zp::c02 const* utf32srh(::zp::c02 const* zp_prv_rsr str, ::zp::c02 chr) {return const_cast< ::zp::c02 const*>(::zp_utf32srh(str,chr));}
+
+ zp_iln zp_nothw zp_useres inline ::zp::siz utf8enclen( ::zp::c02 const* zp_prv_rsr str) {return ::zp_utf8enclen(str);}
+ zp_iln zp_nothw zp_useres inline ::zp::siz utf8declen( ::zp::c8 const* zp_prv_rsr str) {return ::zp_utf8declen(str);}
+ zp_iln zp_nothw zp_useres inline ::zp::siz utf16enclen(::zp::c02 const* zp_prv_rsr str) {return ::zp_utf16enclen(str);}
+ zp_iln zp_nothw zp_useres inline ::zp::siz utf16declen(::zp::c01 const* zp_prv_rsr str) {return ::zp_utf16declen(str);}
+
+ zp_iln zp_nothw inline void utf8enc( ::zp::c8 * zp_prv_rsr dst,::zp::c02 const* zp_prv_rsr src) {return ::zp_utf8enc(dst,src);}
+ zp_iln zp_nothw inline void utf8dec( ::zp::c02 * zp_prv_rsr dst,::zp::c8 const* zp_prv_rsr src) {return ::zp_utf8dec(dst,src);}
+ zp_iln zp_nothw inline void utf16enc( ::zp::c01 * zp_prv_rsr dst,::zp::c02 const* zp_prv_rsr src) {return ::zp_utf16enc(dst,src);}
+ zp_iln zp_nothw inline void utf16dec( ::zp::c02 * zp_prv_rsr dst,::zp::c01 const* zp_prv_rsr src) {return ::zp_utf16dec(dst,src);}
+ zp_iln zp_nothw inline void win1252enc(::zp::c8 * zp_prv_rsr dst,::zp::c02 const* zp_prv_rsr src) {return ::zp_win1252enc(dst,src);}
+ zp_iln zp_nothw inline void win1252dec(::zp::c02 * zp_prv_rsr dst,::zp::c8 const* zp_prv_rsr src) {return ::zp_win1252dec(dst,src);}
 
 //template<typename typ> zp_nothw void fmt(::zp::c02 * buf,typ val,::zp::i8 bs,bool rtl = false);
 }
diff --git a/zp/include/zp/str.h b/zp/include/zp/str.h
index 10a6aff..01de713 100644
--- a/zp/include/zp/str.h
+++ b/zp/include/zp/str.h
@@ -11,35 +11,35 @@
 
 zp_prv_cdecl
 
-zp_nothw zp_siz zp_strcpy(char * dst, char const* src);
-zp_nothw zp_useres bool zp_strequ(char const* lstr,char const* rstr);
-zp_nothw zp_siz zp_strfil(char * str, char chr);
-zp_nothw zp_siz zp_strlen(char const* str);
-zp_nothw char * zp_strsrh(char const* str, char chr);
-
-zp_nothw zp_siz zp_wstrcpy(zp_wchr * dst, zp_wchr const* src);
-zp_nothw zp_useres bool zp_wstrequ(zp_wchr const* lstr,zp_wchr const* rstr);
-zp_nothw zp_siz zp_wstrfil(zp_wchr * str, zp_wchr chr);
-zp_nothw zp_siz zp_wstrlen(zp_wchr const* str);
-zp_nothw zp_wchr * zp_wstrsrh(zp_wchr const* str, zp_wchr chr);
-
-zp_nothw zp_siz zp_utf32cpy(zp_c02 * dst, zp_c02 const* src);
-zp_nothw zp_useres bool zp_utf32equ(zp_c02 const* lstr,zp_c02 const* rstr);
-zp_nothw zp_siz zp_utf32fil(zp_c02 * str, zp_c02 chr);
-zp_nothw zp_siz zp_utf32len(zp_c02 const* str);
-zp_nothw zp_c02 * zp_utf32srh(zp_c02 const* str, zp_c02 chr);
-
-zp_nothw zp_useres zp_siz zp_utf8enclen( zp_c02 const* str);
-zp_nothw zp_useres zp_siz zp_utf8declen( zp_c8 const* str);
-zp_nothw zp_useres zp_siz zp_utf16enclen(zp_c02 const* str);
-zp_nothw zp_useres zp_siz zp_utf16declen(zp_c01 const* str);
-
-zp_nothw void zp_utf8enc( zp_c8 * dst,zp_c02 const* src);
-zp_nothw void zp_utf8dec( zp_c02 * dst,zp_c8 const* src);
-zp_nothw void zp_utf16enc( zp_c01 * dst,zp_c02 const* src);
-zp_nothw void zp_utf16dec( zp_c02 * dst,zp_c01 const* src);
-zp_nothw void zp_win1252enc(zp_c8 * dst,zp_c02 const* src);
-zp_nothw void zp_win1252dec(zp_c02 * dst,zp_c8 const* src);
+zp_nothw zp_siz zp_strcpy(char * zp_prv_rsr dst, char const* zp_prv_rsr src);
+zp_nothw zp_useres bool zp_strequ(char const* zp_prv_rsr lstr,char const* zp_prv_rsr rstr);
+zp_nothw zp_siz zp_strfil(char * zp_prv_rsr str, char chr);
+zp_nothw zp_siz zp_strlen(char const* zp_prv_rsr str);
+zp_nothw char * zp_strsrh(char const* zp_prv_rsr str, char chr);
+
+zp_nothw zp_siz zp_wstrcpy(zp_wchr * zp_prv_rsr dst, zp_wchr const* zp_prv_rsr src);
+zp_nothw zp_useres bool zp_wstrequ(zp_wchr const* zp_prv_rsr lstr,zp_wchr const* zp_prv_rsr rstr);
+zp_nothw zp_siz zp_wstrfil(zp_wchr * zp_prv_rsr str, zp_wchr chr);
+zp_nothw zp_siz zp_wstrlen(zp_wchr const* zp_prv_rsr str);
+zp_nothw zp_wchr * zp_wstrsrh(zp_wchr const* zp_prv_rsr str, zp_wchr chr);
+
+zp_nothw zp_siz zp_utf32cpy(zp_c02 * zp_prv_rsr dst, zp_c02 const* zp_prv_rsr src);
+zp_nothw zp_useres bool zp_utf32equ(zp_c02 const* zp_prv_rsr lstr,zp_c02 const* zp_prv_rsr rstr);
+zp_nothw zp_siz zp_utf32fil(zp_c02 * zp_prv_rsr str, zp_c02 chr);
+zp_nothw zp_siz zp_utf32len(zp_c02 const* zp_prv_rsr str);
+zp_nothw zp_c02 * zp_utf32srh(zp_c02 const* zp_prv_rsr str, zp_c02 chr);
+
+zp_nothw zp_useres zp_siz zp_utf8enclen( zp_c02 const* zp_prv_rsr str);
+zp_nothw zp_useres zp_siz zp_utf8declen( zp_c8 const* zp_prv_rsr str);
+zp_nothw zp_useres zp_siz zp_utf16enclen(zp_c02 const* zp_prv_rsr str);
+zp_nothw zp_useres zp_siz zp_utf16declen(zp_c01 const* zp_prv_rsr str);
+
+zp_nothw void zp_utf8enc( zp_c8 * zp_prv_rsr dst,zp_c02 const* zp_prv_rsr src);
+zp_nothw void zp_utf8dec( zp_c02 * zp_prv_rsr dst,zp_c8 const* zp_prv_rsr src);
+zp_nothw void zp_utf16enc( zp_c01 * zp_prv_rsr dst,zp_c02 const* zp_prv_rsr src);
+zp_nothw void zp_utf16dec( zp_c02 * zp_prv_rsr dst,zp_c01 const* zp_prv_rsr src);
+zp_nothw void zp_win1252enc(zp_c8 * zp_prv_rsr dst,zp_c02 const* zp_prv_rsr src);
+zp_nothw void zp_win1252dec(zp_c02 * zp_prv_rsr dst,zp_c8 const* zp_prv_rsr src);
 
 /*
 fmt:
@@ -97,7 +97,7 @@ zp_nothw void zp_win1252dec(zp_c02 * dst,zp_c8 const* src);
 - z zp_siz
 - ze zp_sizerr
 */
-zp_nothw zp_siz zp_fmt(char * buf,char const* msg,...);
+//zp_nothw zp_siz zp_fmt(char * buf,char const* msg,...);
 
 zp_prv_cdeclend
 
diff --git a/zp/include/zp/zp.h b/zp/include/zp/zp.h
index 7f88094..444ffa1 100644
--- a/zp/include/zp/zp.h
+++ b/zp/include/zp/zp.h
@@ -120,6 +120,16 @@
 #define zp_prv_ext
 #endif
 
+#if zp_imp_gcc
+#define zp_prv_rsr __restrict__
+#elif zp_imp_msvc
+#define zp_prv_rsr __restrict
+#elif zp_std_c99
+#define zp_prv_rsr restrict
+#else
+#define zp_prv_rsr
+#endif
+
 /*
 Currently, we guarantee the "bool" type (and 
 its macros) to be present, regardles of the 
diff --git a/zp/source/any/str/strcpy.cc b/zp/source/any/str/strcpy.cc
index 2a7986d..9e7d5cd 100644
--- a/zp/source/any/str/strcpy.cc
+++ b/zp/source/any/str/strcpy.cc
@@ -6,6 +6,6 @@
 
 #include <zp/prv/str>
 
-extern "C" zp_nothw ::zp::siz zp_strcpy(char * const dst,char const* const src) {
+extern "C" zp_nothw ::zp::siz zp_strcpy(char * const zp_prv_rsr dst,char const* const zp_prv_rsr src) {
 return ::zp::det::strcpy(dst,src);
 }
diff --git a/zp/source/any/str/strequ.cc b/zp/source/any/str/strequ.cc
index cd9f2bf..45f1cc7 100644
--- a/zp/source/any/str/strequ.cc
+++ b/zp/source/any/str/strequ.cc
@@ -6,6 +6,6 @@
 
 #include <zp/prv/str>
 
-extern "C" zp_nothw bool zp_strequ(char const* const lstr,char const* const rstr) {
+extern "C" zp_nothw bool zp_strequ(char const* const zp_prv_rsr lstr,char const* const zp_prv_rsr rstr) {
 return ::zp::det::strequ(lstr,rstr);
 }
diff --git a/zp/source/any/str/strfil.cc b/zp/source/any/str/strfil.cc
index 06d09e2..c7c16dd 100644
--- a/zp/source/any/str/strfil.cc
+++ b/zp/source/any/str/strfil.cc
@@ -6,6 +6,6 @@
 
 #include <zp/prv/str>
 
-extern "C" zp_nothw zp_siz zp_strfil(char * const str,char const chr) {
+extern "C" zp_nothw zp_siz zp_strfil(char * const zp_prv_rsr str,char const chr) {
 return ::zp::det::strfil(str,chr);
 }
diff --git a/zp/source/any/str/strlen.cc b/zp/source/any/str/strlen.cc
index 536f16e..c8a5843 100644
--- a/zp/source/any/str/strlen.cc
+++ b/zp/source/any/str/strlen.cc
@@ -6,6 +6,6 @@
 
 #include <zp/prv/str>
 
-extern "C" zp_nothw ::zp::siz zp_strlen(char const* const str) {
+extern "C" zp_nothw ::zp::siz zp_strlen(char const* const zp_prv_rsr str) {
 return ::zp::det::strlen(str);
 }
diff --git a/zp/source/any/str/strsrh.cc b/zp/source/any/str/strsrh.cc
index 8156e11..2f63a9d 100644
--- a/zp/source/any/str/strsrh.cc
+++ b/zp/source/any/str/strsrh.cc
@@ -6,6 +6,6 @@
 
 #include <zp/prv/str>
 
-extern "C" zp_nothw char * zp_strsrh(char const* const str,char const chr) {
+extern "C" zp_nothw char * zp_strsrh(char const* const zp_prv_rsr str,char const chr) {
 return ::zp::det::strsrh(str,chr);
 }
diff --git a/zp/source/any/str/utf16dec.c b/zp/source/any/str/utf16dec.c
index 0d2fbf4..62afcb3 100644
--- a/zp/source/any/str/utf16dec.c
+++ b/zp/source/any/str/utf16dec.c
@@ -6,7 +6,7 @@
 
 #include <zp/str.h>
 
-void zp_utf16dec(zp_c02 * dst,zp_c01 const* src) {
+void zp_utf16dec(zp_c02 * zp_prv_rsr dst,zp_c01 const* zp_prv_rsr src) {
 for (;;++dst) {
 zp_c01 const hex = *src++;
 
diff --git a/zp/source/any/str/utf16declen.c b/zp/source/any/str/utf16declen.c
index 746e732..2150233 100644
--- a/zp/source/any/str/utf16declen.c
+++ b/zp/source/any/str/utf16declen.c
@@ -6,7 +6,7 @@
 
 #include <zp/str.h>
 
-zp_siz zp_utf16declen(zp_c01 const* str) {
+zp_siz zp_utf16declen(zp_c01 const* zp_prv_rsr str) {
 zp_siz len = 0x0u;
 
 for (;;++len) {
diff --git a/zp/source/any/str/utf16enc.c b/zp/source/any/str/utf16enc.c
index 7ed8e99..c24501c 100644
--- a/zp/source/any/str/utf16enc.c
+++ b/zp/source/any/str/utf16enc.c
@@ -6,7 +6,7 @@
 
 #include <zp/str.h>
 
-void zp_utf16enc(zp_c01 * dst,zp_c02 const* src) {
+void zp_utf16enc(zp_c01 * zp_prv_rsr dst,zp_c02 const* zp_prv_rsr src) {
 for (;;++src) {
 zp_c02 const chr = *src;
 
diff --git a/zp/source/any/str/utf16enclen.c b/zp/source/any/str/utf16enclen.c
index 4ebb41a..17e633e 100644
--- a/zp/source/any/str/utf16enclen.c
+++ b/zp/source/any/str/utf16enclen.c
@@ -6,7 +6,7 @@
 
 #include <zp/str.h>
 
-zp_siz zp_utf16enclen(zp_c02 const* str) {
+zp_siz zp_utf16enclen(zp_c02 const* zp_prv_rsr str) {
 zp_siz len = 0x0u;
 
 for (;;++str) {
diff --git a/zp/source/any/str/utf32cpy.cc b/zp/source/any/str/utf32cpy.cc
index fb64106..0562f06 100644
--- a/zp/source/any/str/utf32cpy.cc
+++ b/zp/source/any/str/utf32cpy.cc
@@ -6,6 +6,6 @@
 
 #include <zp/prv/str>
 
-extern "C" zp_nothw ::zp::siz zp_utf32cpy(::zp::c02 * const dst,::zp::c02 const* const src) {
+extern "C" zp_nothw ::zp::siz zp_utf32cpy(::zp::c02 * const zp_prv_rsr dst,::zp::c02 const* const zp_prv_rsr src) {
 return ::zp::det::strcpy(dst,src);
 }
diff --git a/zp/source/any/str/utf32equ.cc b/zp/source/any/str/utf32equ.cc
index 78d22f9..d5a7d39 100644
--- a/zp/source/any/str/utf32equ.cc
+++ b/zp/source/any/str/utf32equ.cc
@@ -6,6 +6,6 @@
 
 #include <zp/prv/str>
 
-extern "C" zp_nothw bool zp_utf32equ(::zp::c02 const* const lstr,::zp::c02 const* const rstr) {
+extern "C" zp_nothw bool zp_utf32equ(::zp::c02 const* const zp_prv_rsr lstr,::zp::c02 const* const zp_prv_rsr rstr) {
 return ::zp::det::strequ(lstr,rstr);
 }
diff --git a/zp/source/any/str/utf32fil.cc b/zp/source/any/str/utf32fil.cc
index 6e04d92..a920c9a 100644
--- a/zp/source/any/str/utf32fil.cc
+++ b/zp/source/any/str/utf32fil.cc
@@ -6,6 +6,6 @@
 
 #include <zp/prv/str>
 
-extern "C" zp_nothw zp_siz zp_utf32fil(::zp::c02 * const str,::zp::c02 const chr) {
+extern "C" zp_nothw zp_siz zp_utf32fil(::zp::c02 * const zp_prv_rsr str,::zp::c02 const chr) {
 return ::zp::det::strfil(str,chr);
 }
diff --git a/zp/source/any/str/utf32len.cc b/zp/source/any/str/utf32len.cc
index f66be43..e38093d 100644
--- a/zp/source/any/str/utf32len.cc
+++ b/zp/source/any/str/utf32len.cc
@@ -6,6 +6,6 @@
 
 #include <zp/prv/str>
 
-extern "C" zp_nothw ::zp::siz zp_utf32len(::zp::c02 const* const str) {
+extern "C" zp_nothw ::zp::siz zp_utf32len(::zp::c02 const* const zp_prv_rsr str) {
 return ::zp::det::strlen(str);
 }
diff --git a/zp/source/any/str/utf32srh.cc b/zp/source/any/str/utf32srh.cc
index d4dfa30..2247b84 100644
--- a/zp/source/any/str/utf32srh.cc
+++ b/zp/source/any/str/utf32srh.cc
@@ -6,6 +6,6 @@
 
 #include <zp/prv/str>
 
-extern "C" zp_nothw ::zp::c02 * zp_utf32srh(::zp::c02 const* const str,::zp::c02 const chr) {
+extern "C" zp_nothw ::zp::c02 * zp_utf32srh(::zp::c02 const* const zp_prv_rsr str,::zp::c02 const chr) {
 return ::zp::det::strsrh(str,chr);
 }
diff --git a/zp/source/any/str/utf8dec.c b/zp/source/any/str/utf8dec.c
index a2a9788..4251d5d 100644
--- a/zp/source/any/str/utf8dec.c
+++ b/zp/source/any/str/utf8dec.c
@@ -6,7 +6,7 @@
 
 #include <zp/str.h>
 
-void zp_utf8dec(zp_c02 * dst,zp_c8 const* src) {
+void zp_utf8dec(zp_c02 * zp_prv_rsr dst,zp_c8 const* zp_prv_rsr src) {
 for (;;++dst) {
 zp_c8 const oct = *src++;
 
diff --git a/zp/source/any/str/utf8declen.c b/zp/source/any/str/utf8declen.c
index c791f9b..caea299 100644
--- a/zp/source/any/str/utf8declen.c
+++ b/zp/source/any/str/utf8declen.c
@@ -6,7 +6,7 @@
 
 #include <zp/str.h>
 
-zp_siz zp_utf8declen(zp_c8 const* str) {
+zp_siz zp_utf8declen(zp_c8 const* zp_prv_rsr str) {
 zp_siz len = 0x0u;
 
 for (;;++len) {
diff --git a/zp/source/any/str/utf8enc.c b/zp/source/any/str/utf8enc.c
index e8ac3ce..f98fa89 100644
--- a/zp/source/any/str/utf8enc.c
+++ b/zp/source/any/str/utf8enc.c
@@ -6,7 +6,7 @@
 
 #include <zp/str.h>
 
-void zp_utf8enc(zp_c8 * dst,zp_c02 const* src) {
+void zp_utf8enc(zp_c8 * zp_prv_rsr dst,zp_c02 const* zp_prv_rsr src) {
 for (;;++src) {
 zp_c02 const chr = *src;
 
diff --git a/zp/source/any/str/utf8enclen.c b/zp/source/any/str/utf8enclen.c
index e3de929..bf69daf 100644
--- a/zp/source/any/str/utf8enclen.c
+++ b/zp/source/any/str/utf8enclen.c
@@ -6,7 +6,7 @@
 
 #include <zp/str.h>
 
-zp_siz zp_utf8enclen(zp_c02 const* str) {
+zp_siz zp_utf8enclen(zp_c02 const* zp_prv_rsr str) {
 zp_siz len = 0x0u;
 
 for (;;++str) {
diff --git a/zp/source/any/str/win1252dec.c b/zp/source/any/str/win1252dec.c
index 8d67f38..7671a94 100644
--- a/zp/source/any/str/win1252dec.c
+++ b/zp/source/any/str/win1252dec.c
@@ -6,7 +6,7 @@
 
 #include <zp/str.h>
 
-void zp_win1252dec(zp_c02 * dst,zp_c8 const* src) {
+void zp_win1252dec(zp_c02 * zp_prv_rsr dst,zp_c8 const* zp_prv_rsr src) {
 for (;;++src,++dst) {
 zp_c8 const chr = *src;
 
diff --git a/zp/source/any/str/win1252enc.c b/zp/source/any/str/win1252enc.c
index 43a8399..36de222 100644
--- a/zp/source/any/str/win1252enc.c
+++ b/zp/source/any/str/win1252enc.c
@@ -6,7 +6,7 @@
 
 #include <zp/str.h>
 
-void zp_win1252enc(zp_c8 * dst,zp_c02 const* src) {
+void zp_win1252enc(zp_c8 * zp_prv_rsr dst,zp_c02 const* zp_prv_rsr src) {
 for (;;++src,++dst) {
 zp_c02 const chr = *src;
 
diff --git a/zp/source/any/str/wstrcpy.cc b/zp/source/any/str/wstrcpy.cc
index cbc576f..3c48706 100644
--- a/zp/source/any/str/wstrcpy.cc
+++ b/zp/source/any/str/wstrcpy.cc
@@ -6,6 +6,6 @@
 
 #include <zp/prv/str>
 
-extern "C" zp_nothw ::zp::siz zp_wstrcpy(::zp::wchr * const dst,::zp::wchr const* const src) {
+extern "C" zp_nothw ::zp::siz zp_wstrcpy(::zp::wchr * const zp_prv_rsr dst,::zp::wchr const* const zp_prv_rsr src) {
 return ::zp::det::strcpy(dst,src);
 }
diff --git a/zp/source/any/str/wstrequ.cc b/zp/source/any/str/wstrequ.cc
index 14cc7d4..477b90d 100644
--- a/zp/source/any/str/wstrequ.cc
+++ b/zp/source/any/str/wstrequ.cc
@@ -6,6 +6,6 @@
 
 #include <zp/prv/str>
 
-extern "C" zp_nothw bool zp_wstrequ(::zp::wchr const* const lstr,::zp::wchr const* const rstr) {
+extern "C" zp_nothw bool zp_wstrequ(::zp::wchr const* const zp_prv_rsr lstr,::zp::wchr const* const zp_prv_rsr rstr) {
 return ::zp::det::strequ(lstr,rstr);;
 }
diff --git a/zp/source/any/str/wstrfil.cc b/zp/source/any/str/wstrfil.cc
index ef59554..4c7894e 100644
--- a/zp/source/any/str/wstrfil.cc
+++ b/zp/source/any/str/wstrfil.cc
@@ -6,6 +6,6 @@
 
 #include <zp/prv/str>
 
-extern "C" zp_nothw zp_siz zp_wstrfil(::zp::wchr * const str,::zp::wchr const chr) {
+extern "C" zp_nothw zp_siz zp_wstrfil(::zp::wchr * const zp_prv_rsr str,::zp::wchr const chr) {
 return ::zp::det::strfil(str,chr);
 }
diff --git a/zp/source/any/str/wstrlen.cc b/zp/source/any/str/wstrlen.cc
index 9ca73cd..4af439c 100644
--- a/zp/source/any/str/wstrlen.cc
+++ b/zp/source/any/str/wstrlen.cc
@@ -6,6 +6,6 @@
 
 #include <zp/prv/str>
 
-extern "C" zp_nothw ::zp::siz zp_wstrlen(::zp::wchr const* const str) {
+extern "C" zp_nothw ::zp::siz zp_wstrlen(::zp::wchr const* const zp_prv_rsr str) {
 return ::zp::det::strlen(str);
 }
diff --git a/zp/source/any/str/wstrsrh.cc b/zp/source/any/str/wstrsrh.cc
index 5dd5bbc..6fec32f 100644
--- a/zp/source/any/str/wstrsrh.cc
+++ b/zp/source/any/str/wstrsrh.cc
@@ -6,6 +6,6 @@
 
 #include <zp/prv/str>
 
-extern "C" zp_nothw ::zp::wchr * zp_wstrsrh(::zp::wchr const* const str,::zp::wchr const chr) {
+extern "C" zp_nothw ::zp::wchr * zp_wstrsrh(::zp::wchr const* const zp_prv_rsr str,::zp::wchr const chr) {
 return ::zp::det::strsrh(str,chr);
 }