Changeset 473 for trunk/libs/libalmosmkh/almosmkh.c

Timestamp:

Aug 21, 2018, 6:01:01 PM (6 years ago)

Author:

alain

Message:

Fix several GCC warning related to the -Wextra compilation option.

File:

• trunk/libs/libalmosmkh/almosmkh.c (modified) (4 diffs)

trunk/libs/libalmosmkh/almosmkh.c

@@ -434 +434 @@
 
     // check store size power of 2
-    if( store_size != (1<<free_index) )
+    if( store_size != (unsigned int)(1<<free_index) )
     {
         printf("\n[ERROR] in %s : store[%x] size not power of 2 / size = %x\n",
@@ -557 +557 @@
 {
     // test terminal case
-    if ( (1<<searched_index) > store->store_size )  // failure : return a NULL value
+    if ( (unsigned int)(1<<searched_index) > store->store_size )  // failure
     {
         return 0;
@@ -729 +729 @@
 
     // compute old size
-    char * pchar = (char *) (store[cxy].alloc_base + index);
-    int old_size = 1 << ((int) *pchar);
+    char        * pchar    = (char *) (store[cxy].alloc_base + index);
+    unsigned int  old_size = (unsigned int)(1 << ((int) *pchar));
 
     // allocate a new block
@@ -736 +736 @@
 
     // save old data to new block
-    int min_size = (size < old_size) ? size : old_size;
+    int min_size = (int)((size < old_size) ? size : old_size);
     memcpy( new_ptr, ptr, min_size );