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

Replace strerror_r with mxs_strerror

Browse Source 
The mxs_strerror function requires no local buffer, thus making it simpler
and cleaner to use.
This commit is contained in:
Markus Mäkelä
2017-03-07 12:18:53 +02:00
parent d7e48f93bb
commit e1a1959bc2
33 changed files with 174 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
avro/maxavro_file.c
View File

@ -27,9 +27,8 @@ static bool maxavro_read_sync(FILE *file, uint8_t* sync)
if (ferror(file))
{
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to read file sync marker: %d, %s", errno,
strerror_r(errno, err, sizeof(err)));
mxs_strerror(errno));
}
else if (feof(file))
{
@ -52,8 +51,7 @@ bool maxavro_verify_block(MAXAVRO_FILE *file)
{
if (ferror(file->file))
{
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to read file: %d %s", errno, strerror_r(errno, err, sizeof(err)));
MXS_ERROR("Failed to read file: %d %s", errno, mxs_strerror(errno));
}
else if (rc > 0 || !feof(file->file))
{
@ -181,9 +179,8 @@ bool maxavro_read_datablock_start(MAXAVRO_FILE* file)
if (pos == -1)
{
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to read datablock start: %d, %s", errno,
strerror_r(errno, err, sizeof(err)));
mxs_strerror(errno));
}
else
{
@ -421,9 +418,8 @@ GWBUF* maxavro_file_binary_header(MAXAVRO_FILE *file)
{
if (ferror(file->file))
{
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to read binary header: %d, %s", errno,
strerror_r(errno, err, sizeof(err)));
mxs_strerror(errno));
}
else if (feof(file->file))
{
@ -444,9 +440,8 @@ GWBUF* maxavro_file_binary_header(MAXAVRO_FILE *file)
}
else
{
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to read binary header: %d, %s", errno,
strerror_r(errno, err, sizeof(err)));
mxs_strerror(errno));
}
return rval;

3
avro/maxavro_record.c
View File

@ -325,9 +325,8 @@ GWBUF* maxavro_record_read_binary(MAXAVRO_FILE *file)
{
if (ferror(file->file))
{
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to read %ld bytes: %d, %s", data_size, errno,
strerror_r(errno, err, sizeof(err)));
mxs_strerror(errno));
file->last_error = MAXAVRO_ERR_IO;
}
gwbuf_free(rval);