mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from 'size_t' to 'type', possible loss of data)
Handle string length as size_t, consistently (almost always:)) Change function prototypes to accept size_t, where in the past ulong or uint were used. change local/member variables to size_t when appropriate. This fix excludes rocksdb, spider,spider, sphinx and connect for now.
This commit is contained in:
@ -54,20 +54,20 @@ struct LEX_STRING_u : public Storage
|
||||
Storage::str= NULL;
|
||||
Storage::length= 0;
|
||||
}
|
||||
LEX_STRING_u(const char *_str, uint32 _len, CHARSET_INFO *)
|
||||
LEX_STRING_u(const char *_str, size_t _len, CHARSET_INFO *)
|
||||
{
|
||||
Storage::str= _str;
|
||||
Storage::length= _len;
|
||||
}
|
||||
uint32 length() const
|
||||
{
|
||||
return Storage::length;
|
||||
return (uint32)Storage::length;
|
||||
}
|
||||
const char *ptr() const
|
||||
{
|
||||
return Storage::str;
|
||||
}
|
||||
void set(const char *_str, uint32 _len, CHARSET_INFO *)
|
||||
void set(const char *_str, size_t _len, CHARSET_INFO *)
|
||||
{
|
||||
Storage::str= _str;
|
||||
Storage::length= _len;
|
||||
|
Reference in New Issue
Block a user