diff options
author | unknown <monty@mysql.com> | 2006-06-19 12:45:34 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2006-06-19 12:45:34 +0300 |
commit | 4b316e6fd68a83421dffa5cf1d2add78bb8c8e65 (patch) | |
tree | b1eef84ec3b6195237d928b1ebea0aaa0acf90a7 /sql/sql_crypt.cc | |
parent | 7f19b1cc05adb189de29ce4475f6539ec1ac4d09 (diff) | |
download | mariadb-git-4b316e6fd68a83421dffa5cf1d2add78bb8c8e65.tar.gz |
unsigned char -> uchar
Added missing copyright
Indentation and prototype fixes
Fixed compiler warning
include/my_sys.h:
Fix prototype for my_print_open_files.
Indentation fixes
mysys/mf_keycache.c:
Fix that key cache can be compiled without #define THREAD
mysys/my_error.c:
Indentation cleanups
mysys/my_memmem.c:
Added missing copyright.
Fix include files
sql/event.cc:
unsigned char -> uchar
sql/field.cc:
unsigned char -> uchar
sql/filesort.cc:
Indentation fix
sql/ha_ndbcluster.cc:
unsigned char -> uchar
sql/ha_ndbcluster_binlog.cc:
unsigned char -> uchar
sql/item_strfunc.cc:
unsigned char -> uchar
sql/log_event.cc:
unsigned char -> uchar
sql/opt_range.cc:
Indentation fixes
sql/sql_crypt.cc:
unsigned char -> uchar
sql/sql_string.cc:
unsigned char -> uchar
sql/tztime.cc:
unsigned char -> uchar
storage/heap/hp_extra.c:
Clear also next_block (See heap_scan_init)
storage/heap/hp_test2.c:
Set required struct memeber max_table_size
(Fixes that hp_test2 works again)
storage/myisam/mi_rsamepos.c:
Fixed bug in mi_rsame_with_pos
strings/decimal.c:
Fixed compiler warning
Diffstat (limited to 'sql/sql_crypt.cc')
-rw-r--r-- | sql/sql_crypt.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_crypt.cc b/sql/sql_crypt.cc index f21a109e95d..4e73941fb49 100644 --- a/sql/sql_crypt.cc +++ b/sql/sql_crypt.cc @@ -52,7 +52,7 @@ void SQL_CRYPT::crypt_init(ulong *rand_nr) decode_buff[+i]=a; } for (i=0 ; i <= 255 ; i++) - encode_buff[(unsigned char) decode_buff[i]]=i; + encode_buff[(uchar) decode_buff[i]]=i; org_rand=rand; shift=0; } @@ -75,7 +75,7 @@ void SQL_CRYPT::decode(char *str,uint length) for (uint i=0; i < length; i++) { shift^=(uint) (my_rnd(&rand)*255.0); - uint idx= (uint) ((unsigned char) str[0] ^ shift); + uint idx= (uint) ((uchar) str[0] ^ shift); *str = decode_buff[idx]; shift^= (uint) (uchar) *str++; } |