branches/zip: Remove redundant type casts. Change the parameter type

of ut_strcmp() from const void* to const char*.

dict/dict0dict.c

@@ -2164,7 +2164,7 @@ dict_foreign_add_to_cache(
 	if (for_in_cache->referenced_table == NULL && ref_table) {
 		index = dict_foreign_find_index(
 			ref_table,
-			(const char**) for_in_cache->referenced_col_names,
+			for_in_cache->referenced_col_names,
 			for_in_cache->n_fields, for_in_cache->foreign_index,
 			check_charsets, FALSE);
 
@@ -2196,7 +2196,7 @@ dict_foreign_add_to_cache(
 	if (for_in_cache->foreign_table == NULL && for_table) {
 		index = dict_foreign_find_index(
 			for_table,
-			(const char**) for_in_cache->foreign_col_names,
+			for_in_cache->foreign_col_names,
 			for_in_cache->n_fields,
 			for_in_cache->referenced_index, check_charsets,
 			for_in_cache->type
@@ -4359,7 +4359,7 @@ dict_table_find_equivalent_index(
 	}
 
 	equiv_index = dict_foreign_find_index(
-		table, (const char**)column_names, index->n_fields,
+		table, column_names, index->n_fields,
 		index, TRUE, FALSE);
 
 	mem_free(column_names);

include/ut0mem.h

@@ -117,7 +117,7 @@ ut_strlen(const char* str);
 
 UNIV_INLINE
 int
-ut_strcmp(const void* str1, const void* str2);
+ut_strcmp(const char* str1, const char* str2);
 
 /**************************************************************************
 Copies up to size - 1 characters from the NUL-terminated string src to

include/ut0mem.ic

@@ -43,9 +43,9 @@ ut_strlen(const char* str)
 
 UNIV_INLINE
 int
-ut_strcmp(const void* str1, const void* str2)
+ut_strcmp(const char* str1, const char* str2)
 {
-	return(strcmp((const char*)str1, (const char*)str2));
+	return(strcmp(str1, str2));
 }
 
 /**************************************************************************

os/os0file.c

@@ -1436,7 +1436,7 @@ os_file_delete_if_exists(
 #else
 	int	ret;
 
-	ret = unlink((const char*)name);
+	ret = unlink(name);
 
 	if (ret != 0 && errno != ENOENT) {
 		os_file_handle_error_no_exit(name, "delete");
@@ -1499,7 +1499,7 @@ os_file_delete(
 #else
 	int	ret;
 
-	ret = unlink((const char*)name);
+	ret = unlink(name);
 
 	if (ret != 0) {
 		os_file_handle_error_no_exit(name, "delete");
@@ -1538,7 +1538,7 @@ os_file_rename(
 #else
 	int	ret;
 
-	ret = rename((const char*)oldpath, (const char*)newpath);
+	ret = rename(oldpath, newpath);
 
 	if (ret != 0) {
 		os_file_handle_error_no_exit(oldpath, "rename");