hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefix le[int|str]-functions with "mxs_"

Browse Source
This commit is contained in:
Johan Wikman
2016-12-29 10:10:11 +02:00
parent c008d794c7
commit b40872e600
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/mysql_binlog.c
View File

@ -30,7 +30,7 @@
*
* @param type The table column type
* @return The type of the column in human readable format
* @see lestr_consume
* @see mxs_lestr_consume
*/
const char* column_type_to_string(uint8_t type)
{
@ -120,7 +120,7 @@ bool column_is_blob(uint8_t type)
*
* @param type Type of the column
* @return True if the column is a string type column
* @see lestr_consume
* @see mxs_lestr_consume
*/
bool column_is_variable_string(uint8_t type)
{
@ -175,7 +175,7 @@ bool column_is_temporal(uint8_t type)
*
* @param type Type of the column
* @return True if the column is a string type column
* @see lestr_consume
* @see mxs_lestr_consume
*/
bool column_is_fixed_string(uint8_t type)
{

18
server/core/mysql_utils.c
View File

@ -34,7 +34,7 @@
* @param ptr Start of the length encoded value
* @return Number of bytes before the actual value
*/
size_t leint_bytes(const uint8_t* ptr)
size_t mxs_leint_bytes(const uint8_t* ptr)
{
uint8_t val = *ptr;
if (val < 0xfb)
@ -62,7 +62,7 @@ size_t leint_bytes(const uint8_t* ptr)
* @param c Pointer to the first byte of a length-encoded integer
* @return The value converted to a standard unsigned integer
*/
uint64_t leint_value(const uint8_t* c)
uint64_t mxs_leint_value(const uint8_t* c)
{
uint64_t sz = 0;
@ -98,10 +98,10 @@ uint64_t leint_value(const uint8_t* c)
*
* @param c Pointer to the first byte of a length-encoded integer
*/
uint64_t leint_consume(uint8_t ** c)
uint64_t mxs_leint_consume(uint8_t ** c)
{
uint64_t rval = leint_value(*c);
*c += leint_bytes(*c);
uint64_t rval = mxs_leint_value(*c);
*c += mxs_leint_bytes(*c);
return rval;
}
@ -114,9 +114,9 @@ uint64_t leint_consume(uint8_t ** c)
* @param c Pointer to the first byte of a valid packet.
* @return The newly allocated string or NULL if memory allocation failed
*/
char* lestr_consume_dup(uint8_t** c)
char* mxs_lestr_consume_dup(uint8_t** c)
{
uint64_t slen = leint_consume(c);
uint64_t slen = mxs_leint_consume(c);
char *str = MXS_MALLOC((slen + 1) * sizeof(char));
if (str)
@ -138,9 +138,9 @@ char* lestr_consume_dup(uint8_t** c)
* @param size Pointer to a variable where the size of the string is stored
* @return Pointer to the start of the string
*/
char* lestr_consume(uint8_t** c, size_t *size)
char* mxs_lestr_consume(uint8_t** c, size_t *size)
{
uint64_t slen = leint_consume(c);
uint64_t slen = mxs_leint_consume(c);
*size = slen;
char* start = (char*) *c;
*c += slen;