From ba144e2290e100c02d9f4f4648d8ce1cabbdde77 Mon Sep 17 00:00:00 2001
From: unknown <georg@lmy002.wdf.sap.corp>
Date: Mon, 13 Jun 2005 12:41:15 +0200
Subject: fixes for windows 64-bit compiler warnings

heap/hp_hash.c:
  fix for windows 64-bit compiler warnings
heap/hp_update.c:
  fix for windows 64-bit compiler warnings
mysys/default.c:
  fix for windows 64-bit compiler warnings
mysys/default_modify.c:
  fix for windows 64-bit compiler warnings
mysys/mf_iocache.c:
  fix for windows 64-bit compiler warnings
mysys/mf_keycache.c:
  fix for windows 64-bit compiler warnings
mysys/my_alloc.c:
  fix for windows 64-bit compiler warnings
mysys/my_getopt.c:
  fix for windows 64-bit compiler warnings
mysys/my_mmap.c:
  fix for windows 64-bit compiler warnings
mysys/my_once.c:
  fix for windows 64-bit compiler warnings
mysys/string.c:
  fix for windows 64-bit compiler warnings
sql-common/client.c:
  fix for windows 64-bit compiler warnings
sql/field.cc:
  fix for windows 64-bit compiler warnings
sql/gstream.cc:
  fix for windows 64-bit compiler warnings
sql/ha_myisam.cc:
  fix for windows 64-bit compiler warnings
sql/ha_myisammrg.cc:
  fix for windows 64-bit compiler warnings
sql/item.cc:
  fix for windows 64-bit compiler warnings
sql/item.h:
  fix for windows 64-bit compiler warnings
sql/item_cmpfunc.cc:
  fix for windows 64-bit compiler warnings
sql/password.c:
  fix for windows 64-bit compiler warnings
sql/set_var.h:
  fix for windows 64-bit compiler warnings
strings/ctype-big5.c:
  fix for windows 64-bit compiler warnings
strings/ctype-bin.c:
  fix for windows 64-bit compiler warnings
strings/ctype-cp932.c:
  fix for windows 64-bit compiler warnings
strings/ctype-eucjpms.c:
  fix for windows 64-bit compiler warnings
strings/ctype-mb.c:
  fix for windows 64-bit compiler warnings
strings/ctype-simple.c:
  fix for windows 64-bit compiler warnings
strings/ctype-sjis.c:
  fix for windows 64-bit compiler warnings
strings/ctype-uca.c:
  fix for windows 64-bit compiler warnings
strings/ctype-ucs2.c:
  fix for windows 64-bit compiler warnings
strings/ctype-ujis.c:
  fix for windows 64-bit compiler warnings
strings/ctype-utf8.c:
  fix for windows 64-bit compiler warnings
strings/ctype.c:
  fix for windows 64-bit compiler warnings
strings/decimal.c:
  fix for windows 64-bit compiler warnings
strings/xml.c:
  fix for windows 64-bit compiler warnings
---
 mysys/my_getopt.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'mysys/my_getopt.c')

diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 5e93ad56cb5..68bf65b2abe 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -180,7 +180,7 @@ int handle_options(int *argc, char ***argv,
 	}
 	opt_str= check_struct_option(cur_arg, key_name);
 	optend= strcend(opt_str, '=');
-	length= optend - opt_str;
+	length= (uint) (optend - opt_str);
 	if (*optend == '=')
 	  optend++;
 	else
@@ -323,7 +323,7 @@ int handle_options(int *argc, char ***argv,
 	  return EXIT_NO_ARGUMENT_ALLOWED;
 	}
 	value= optp->var_type & GET_ASK_ADDR ?
-	  (*getopt_get_addr)(key_name, strlen(key_name), optp) : optp->value;
+	  (*getopt_get_addr)(key_name, (uint) strlen(key_name), optp) : optp->value;
   
 	if (optp->arg_type == NO_ARG)
 	{
@@ -519,7 +519,7 @@ static char *check_struct_option(char *cur_arg, char *key_name)
   */
   if (end - ptr > 1)
   {
-    uint len= ptr - cur_arg;
+    uint len= (uint) (ptr - cur_arg);
     set_if_smaller(len, FN_REFLEN-1);
     strmake(key_name, cur_arg, len);
     return ++ptr;
@@ -833,7 +833,7 @@ void my_print_help(const struct my_option *options)
     if (strlen(optp->name))
     {
       printf("--%s", optp->name);
-      col+= 2 + strlen(optp->name);
+      col+= 2 + (uint) strlen(optp->name);
       if ((optp->var_type & GET_TYPE_MASK) == GET_STR ||
 	  (optp->var_type & GET_TYPE_MASK) == GET_STR_ALLOC)
       {
@@ -904,7 +904,7 @@ void my_print_variables(const struct my_option *options)
     if (value)
     {
       printf("%s", optp->name);
-      length= strlen(optp->name);
+      length= (uint) strlen(optp->name);
       for (; length < name_space; length++)
 	putchar(' ');
       switch ((optp->var_type & GET_TYPE_MASK)) {
-- 
cgit v1.2.1