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/modules/filter/cache/cachefiltersession.cc vendored
View File

@ -425,9 +425,9 @@ int CacheFilterSession::handle_expecting_response()
}
else
{
// leint_bytes() returns the length of the int type field + the size of the
// mxs_leint_bytes() returns the length of the int type field + the size of the
// integer.
size_t n_bytes = leint_bytes(&header[4]);
size_t n_bytes = mxs_leint_bytes(&header[4]);
if (MYSQL_HEADER_LEN + n_bytes <= buflen)
{
@ -436,7 +436,7 @@ int CacheFilterSession::handle_expecting_response()
gwbuf_copy_data(m_res.pData,
MYSQL_HEADER_LEN + 1, n_bytes - 1, &header[MYSQL_HEADER_LEN + 1]);
m_res.nTotalFields = leint_value(&header[4]);
m_res.nTotalFields = mxs_leint_value(&header[4]);
m_res.offset = MYSQL_HEADER_LEN + n_bytes;
m_state = CACHE_EXPECTING_FIELDS;

6
server/modules/filter/maxrows/maxrows.c
View File

@ -632,9 +632,9 @@ static int handle_expecting_response(MAXROWS_SESSION_DATA *csdata)
}
else
{
// leint_bytes() returns the length of the int type field + the size of the
// mxs_leint_bytes() returns the length of the int type field + the size of the
// integer.
size_t n_bytes = leint_bytes(&header[4]);
size_t n_bytes = mxs_leint_bytes(&header[4]);
if (MYSQL_HEADER_LEN + n_bytes <= buflen)
{
@ -643,7 +643,7 @@ static int handle_expecting_response(MAXROWS_SESSION_DATA *csdata)
gwbuf_copy_data(csdata->res.data,
MYSQL_HEADER_LEN + 1, n_bytes - 1, &header[MYSQL_HEADER_LEN + 1]);
csdata->res.n_totalfields = leint_value(&header[4]);
csdata->res.n_totalfields = mxs_leint_value(&header[4]);
csdata->res.offset += MYSQL_HEADER_LEN + n_bytes;
csdata->state = MAXROWS_EXPECTING_FIELDS;

4
server/modules/routing/avrorouter/avro_rbr.c
View File

@ -247,7 +247,7 @@ bool handle_row_event(AVRO_INSTANCE *router, REP_HEADER *hdr, uint8_t *ptr)
}
/** Number of columns in the table */
uint64_t ncolumns = leint_consume(&ptr);
uint64_t ncolumns = mxs_leint_consume(&ptr);
/** If full row image is used, all columns are present. Currently only full
* row image is supported and thus the bitfield should be all ones. In
@ -546,7 +546,7 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
else if (column_is_variable_string(map->column_types[i]))
{
size_t sz;
char *str = lestr_consume(&ptr, &sz);
char *str = mxs_lestr_consume(&ptr, &sz);
char buf[sz + 1];
memcpy(buf, str, sz);
buf[sz] = '\0';

6
server/modules/routing/avrorouter/avro_schema.c
View File

@ -952,15 +952,15 @@ TABLE_MAP *table_map_alloc(uint8_t *ptr, uint8_t hdr_len, TABLE_CREATE* create)
memcpy(table_name, ptr, table_name_len + 1);
ptr += table_name_len + 1;
uint64_t column_count = leint_value(ptr);
ptr += leint_bytes(ptr);
uint64_t column_count = mxs_leint_value(ptr);
ptr += mxs_leint_bytes(ptr);
/** Column types */
uint8_t *column_types = ptr;
ptr += column_count;
size_t metadata_size = 0;
uint8_t* metadata = (uint8_t*)lestr_consume(&ptr, &metadata_size);
uint8_t* metadata = (uint8_t*)mxs_lestr_consume(&ptr, &metadata_size);
uint8_t *nullmap = ptr;
size_t nullmap_size = (column_count + 7) / 8;
TABLE_MAP *map = MXS_MALLOC(sizeof(TABLE_MAP));