Updated Libtool shared-library versioning. Fixed warnings related to pointers cast

2 files changed, 37 insertions, 37 deletions

diff --git a/src/string/mpu-str8ing.c b/src/string/mpu-str8ing.c
index 326b2e0..b3f05a1 100644
--- a/src/string/mpu-str8ing.c
+++ b/src/string/mpu-str8ing.c
@@ -40,7 +40,7 @@
 __mpu_char8_t *
 mpu_str8cat( __mpu_char8_t *dest, const __mpu_char8_t *src )
 {
-  return strcat( dest, src );
+  return (__mpu_char8_t *)strcat( (char *)dest, (const char *)src );
 }
 
 
@@ -52,7 +52,7 @@ mpu_str8cat( __mpu_char8_t *dest, const __mpu_char8_t *src )
 __mpu_char8_t *
 mpu_str8chr( const __mpu_char8_t *s, int c )
 {
-  return strchr( s, c );
+  return (__mpu_char8_t *)strchr( (const char *)s, c );
 }
 
 
@@ -85,7 +85,7 @@ mpu_str8chrnul( const __mpu_char8_t *s, int c )
 int
 mpu_str8cmp( const __mpu_char8_t *s1, const __mpu_char8_t *s2 )
 {
-  return strcmp( s1, s2 );
+  return strcmp( (const char *)s1, (const char *)s2 );
 }
 
 
@@ -97,7 +97,7 @@ mpu_str8cmp( const __mpu_char8_t *s1, const __mpu_char8_t *s2 )
 __mpu_char8_t *
 mpu_str8cpy( __mpu_char8_t *dest, const __mpu_char8_t *src )
 {
-  return strcpy( dest, src );
+  return (__mpu_char8_t *)strcpy( (char *)dest, (const char *)src );
 }
 
 
@@ -114,7 +114,7 @@ mpu_str8cpy( __mpu_char8_t *dest, const __mpu_char8_t *src )
 __mpu_size_t
 mpu_str8cspn( const __mpu_char8_t *s, const __mpu_char8_t *reject )
 {
-  return strcspn( s, reject );
+  return (__mpu_size_t)strcspn( (const char *)s, (const char *)reject );
 }
 
 
@@ -126,7 +126,7 @@ mpu_str8cspn( const __mpu_char8_t *s, const __mpu_char8_t *reject )
 __mpu_size_t
 mpu_str8len( const __mpu_char8_t *s )
 {
-  return strlen( s );
+  return (__mpu_size_t)strlen( (const char *)s );
 }
 
 
@@ -151,7 +151,7 @@ mpu_str8len( const __mpu_char8_t *s )
 __mpu_char8_t *
 mpu_str8ncat( __mpu_char8_t *dest, const __mpu_char8_t *src, __mpu_size_t n )
 {
-  return strncat( dest, src, n );
+  return (__mpu_char8_t *)strncat( (char *)dest, (const char *)src, (size_t)n );
 }
 
 
@@ -168,7 +168,7 @@ mpu_str8ncat( __mpu_char8_t *dest, const __mpu_char8_t *src, __mpu_size_t n )
 int
 mpu_str8ncmp( const __mpu_char8_t *s1, const __mpu_char8_t *s2, __mpu_size_t n )
 {
-  return strncmp( s1, s2, n );
+  return strncmp( (const char *)s1, (const char *)s2, (size_t)n );
 }
 
 
@@ -180,7 +180,7 @@ mpu_str8ncmp( const __mpu_char8_t *s1, const __mpu_char8_t *s2, __mpu_size_t n )
 __mpu_char8_t *
 mpu_str8ncpy( __mpu_char8_t *dest, const __mpu_char8_t *src, __mpu_size_t n )
 {
-  return strncpy( dest, src, n );
+  return (__mpu_char8_t *)strncpy( (char *)dest, (const char *)src, (size_t)n );
 }
 
 
@@ -214,7 +214,7 @@ mpu_str8nlen( const __mpu_char8_t *s, __mpu_size_t maxlen )
 __mpu_char8_t *
 mpu_str8pbrk( const __mpu_char8_t *s, const __mpu_char8_t *accept )
 {
-  return strpbrk( s, accept );
+  return (__mpu_char8_t *)strpbrk( (const char *)s, (const char *)accept );
 }
 
 
@@ -226,7 +226,7 @@ mpu_str8pbrk( const __mpu_char8_t *s, const __mpu_char8_t *accept )
 __mpu_char8_t *
 mpu_str8rchr( const __mpu_char8_t *s, int c )
 {
-  return strrchr( s, c );
+  return (__mpu_char8_t *)strrchr( (const char *)s, c );
 }
 
 
@@ -243,7 +243,7 @@ mpu_str8rchr( const __mpu_char8_t *s, int c )
 __mpu_size_t
 mpu_str8spn( const __mpu_char8_t *s, const __mpu_char8_t *accept )
 {
-  return strspn( s, accept );
+  return (__mpu_size_t)strspn( (const char *)s, (const char *)accept );
 }
 
 
@@ -262,7 +262,7 @@ mpu_str8spn( const __mpu_char8_t *s, const __mpu_char8_t *accept )
 __mpu_char8_t *
 mpu_str8str( const __mpu_char8_t *haystack, const __mpu_char8_t *needle )
 {
-  return strstr( haystack, needle );
+  return (__mpu_char8_t *)strstr( (const char *)haystack, (const char *)needle );
 }
 
 
@@ -285,12 +285,12 @@ mpu_str8rstr( const __mpu_char8_t *haystack, const __mpu_char8_t *needle )
 {
   const __mpu_char8_t *last = NULL;
   const __mpu_char8_t *p = haystack;
-  __mpu_size_t nlen = strlen( needle );
+  __mpu_size_t nlen = (__mpu_size_t)strlen( (const char *)needle );
 
   if( nlen == 0 )
-    return (__mpu_char8_t *)(haystack + strlen( haystack ));
+    return (__mpu_char8_t *)(haystack + strlen( (const char *)haystack ));
 
-  while( (p = strstr( p, needle )) != NULL )
+  while( (p = (const __mpu_char8_t *)strstr( (const char *)p, (const char *)needle )) != NULL )
   {
     last = p;
     ++p;
@@ -408,7 +408,7 @@ mpu_str8tok_r( __mpu_char8_t *s, const __mpu_char8_t *delim, __mpu_char8_t **sav
   if( s == NULL )
     s = *saveptr;
 
-  s += strspn( s, delim );
+  s += strspn( (const char *)s, (const char *)delim );
   if( *s == '\0' )
   {
     *saveptr = s;
@@ -416,9 +416,9 @@ mpu_str8tok_r( __mpu_char8_t *s, const __mpu_char8_t *delim, __mpu_char8_t **sav
   }
 
   token = s;
-  s = strpbrk( token, delim );
+  s = (__mpu_char8_t *)strpbrk( (const char *)token, (const char *)delim );
   if( s == NULL )
-    *saveptr = token + strlen( token );
+    *saveptr = token + strlen( (const char *)token );
   else
   {
     *s = '\0';
@@ -432,7 +432,7 @@ mpu_str8tok_r( __mpu_char8_t *s, const __mpu_char8_t *delim, __mpu_char8_t **sav
 __mpu_char8_t *
 mpu_str8ndup( const __mpu_char8_t *s, __mpu_size_t n )
 {
-  __mpu_size_t len;
+  __mpu_size_t   len;
   __mpu_char8_t *copy;
 
   if( s == NULL )
@@ -455,7 +455,7 @@ mpu_str8ndup( const __mpu_char8_t *s, __mpu_size_t n )
 __mpu_char8_t *
 mpu_str8dup( const __mpu_char8_t *s )
 {
-  __mpu_size_t len;
+  __mpu_size_t   len;
   __mpu_char8_t *copy;
 
   if( s == NULL )
@@ -464,7 +464,7 @@ mpu_str8dup( const __mpu_char8_t *s )
     return NULL;
   }
 
-  len = strlen( s ) + 1;
+  len = strlen( (const char *)s ) + 1;
   copy = (__mpu_char8_t *)malloc( len );
   if( copy == NULL )
     return NULL;
diff --git a/src/string/mpu-utf8ing.c b/src/string/mpu-utf8ing.c
index b6e49f6..b23cc13 100644
--- a/src/string/mpu-utf8ing.c
+++ b/src/string/mpu-utf8ing.c
@@ -181,7 +181,7 @@ mpu_utf8prev( const __mpu_char8_t *start, const __mpu_char8_t *p )
 const __mpu_char8_t *
 mpu_utf8last( const __mpu_char8_t *s )
 {
-  const __mpu_char8_t *end = s + strlen( s );
+  const __mpu_char8_t *end = s + strlen( (const char *)s );
 
   if( end == s )
     return s;
@@ -370,14 +370,14 @@ mpu_utf8ncmp( const __mpu_char8_t *s1, const __mpu_char8_t *s2, __mpu_size_t n )
 __mpu_char8_t *
 mpu_utf8cpy( __mpu_char8_t *dest, const __mpu_char8_t *src )
 {
-  return strcpy( dest, src );
+  return (__mpu_char8_t *)strcpy( (char *)dest, (const char *)src );
 }
 
 
 __mpu_char8_t *
 mpu_utf8cat( __mpu_char8_t *dest, const __mpu_char8_t *src )
 {
-  return strcat( dest, src );
+  return (__mpu_char8_t *)strcat( (char *)dest, (const char *)src );
 }
 
 
@@ -385,7 +385,7 @@ __mpu_char8_t *
 mpu_utf8ncpy( __mpu_char8_t *dest, const __mpu_char8_t *src, __mpu_size_t n )
 {
   const __mpu_char8_t *end = src;
-  __mpu_char8_t *ret = dest;
+  __mpu_char8_t       *ret = dest;
 
   while( n != 0 && *end != '\0' )
   {
@@ -405,7 +405,7 @@ mpu_utf8ncpy( __mpu_char8_t *dest, const __mpu_char8_t *src, __mpu_size_t n )
 __mpu_char8_t *
 mpu_utf8ncat( __mpu_char8_t *dest, const __mpu_char8_t *src, __mpu_size_t n )
 {
-  __mpu_char8_t *end = dest + strlen( dest );
+  __mpu_char8_t *end = dest + strlen( (const char *)dest );
 
   if( mpu_utf8ncpy( end, src, n ) == NULL )
     return NULL;
@@ -417,8 +417,8 @@ mpu_utf8ncat( __mpu_char8_t *dest, const __mpu_char8_t *src, __mpu_size_t n )
 __mpu_char8_t *
 mpu_utf8pcpy( __mpu_char8_t *dest, const __mpu_char8_t *src )
 {
-  strcpy( dest, src );
-  return dest + strlen( dest );
+  strcpy( (char *)dest, (const char *)src );
+  return dest + strlen( (const char *)dest );
 }
 
 
@@ -447,8 +447,8 @@ mpu_utf8pncpy( __mpu_char8_t *dest, const __mpu_char8_t *src, __mpu_size_t n )
 __mpu_char8_t *
 mpu_utf8chr( const __mpu_char8_t *s, __mpu_char32_t c )
 {
-  __mpu_char32_t value;
-  const __mpu_char8_t *p = s;
+        __mpu_char32_t  value;
+  const __mpu_char8_t  *p = s;
 
   do
   {
@@ -468,9 +468,9 @@ mpu_utf8chr( const __mpu_char8_t *s, __mpu_char32_t c )
 __mpu_char8_t *
 mpu_utf8rchr( const __mpu_char8_t *s, __mpu_char32_t c )
 {
-  __mpu_char8_t *last = NULL;
-  const __mpu_char8_t *p = s;
-  __mpu_char32_t value;
+        __mpu_char8_t  *last = NULL;
+  const __mpu_char8_t  *p = s;
+        __mpu_char32_t  value;
 
   do
   {
@@ -500,7 +500,7 @@ mpu_utf8chrnul( const __mpu_char8_t *s, __mpu_char32_t c )
   if( errno == EILSEQ )
     return NULL;
 
-  return (__mpu_char8_t *)(s + strlen( s ));
+  return (__mpu_char8_t *)(s + strlen( (const char *)s ));
 }
 
 
@@ -594,7 +594,7 @@ mpu_utf8pbrk( const __mpu_char8_t *s, const __mpu_char8_t *accept )
 __mpu_char8_t *
 mpu_utf8str( const __mpu_char8_t *haystack, const __mpu_char8_t *needle )
 {
-  return strstr( haystack, needle );
+  return (__mpu_char8_t *)strstr( (const char *)haystack, (const char *)needle );
 }
 
 
@@ -651,7 +651,7 @@ mpu_utf8tok_r( __mpu_char8_t *s, const __mpu_char8_t *delim, __mpu_char8_t **sav
   {
     if( errno == EILSEQ )
       return NULL;
-    *saveptr = token + strlen( token );
+    *saveptr = token + strlen( (const char *)token );
     return token;
   }