hyung-hwan/hak
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed inconsistent function names

Browse Source
This commit is contained in:
hyung-hwan
2019-03-19 13:29:59 +00:00
parent 1a6aaf1831
commit 02c468bd1f
5 changed files with 25 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/logfmtv.h
View File

@ -69,6 +69,8 @@
#undef PUT_OOCH
#undef PUT_OOCS
#undef PUT_BYTE_IN_HEX
#undef BYTE_PRINTABLE
#define PUT_OOCH(c,n) do { \
if (n > 0) { \
@ -96,7 +98,7 @@
} while (0)
/* TODO: redefine this */
#define BYTE_PRINTABLE(x) ((x >= 'a' && x <= 'z') || (x >= 'A' && x <= 'Z') || (x == ' '))
#define BYTE_PRINTABLE(x) ((x >= 'a' && x <= 'z') || (x >= 'A' && x <= 'Z') || (x >= '0' && x <= '9') || (x == ' '))
static int logfmtv (hcl_t* hcl, const fmtchar_t* fmt, hcl_fmtout_t* data, va_list ap, hcl_outbfmt_t outbfmt)
{
@ -745,34 +747,20 @@ static int logfmtv (hcl_t* hcl, const fmtchar_t* fmt, hcl_fmtout_t* data, va_lis
else if (!(lm_flag & LF_L) && *usp <= 0xFFFF)
{
hcl_uint16_t u16 = *usp;
hcl_uint8_t* bsp = (hcl_uint8_t*)&u16;
PUT_OOCH('\\', 1);
PUT_OOCH('u', 1);
#if defined(HCL_ENDIAN_BIG)
PUT_BYTE_IN_HEX(bsp[0]);
PUT_BYTE_IN_HEX(bsp[1]);
#else
PUT_BYTE_IN_HEX(bsp[1]);
PUT_BYTE_IN_HEX(bsp[0]);
#endif
PUT_BYTE_IN_HEX((u16 >> 8) & 0xFF);
PUT_BYTE_IN_HEX(u16 & 0xFF);
}
else
{
hcl_uint32_t u32 = *usp;
hcl_uint8_t* bsp = (hcl_uint8_t*)&u32;
PUT_OOCH('\\', 1);
PUT_OOCH('U', 1);
#if defined(HCL_ENDIAN_BIG)
PUT_BYTE_IN_HEX(bsp[0]);
PUT_BYTE_IN_HEX(bsp[1]);
PUT_BYTE_IN_HEX(bsp[2]);
PUT_BYTE_IN_HEX(bsp[3]);
#else
PUT_BYTE_IN_HEX(bsp[3]);
PUT_BYTE_IN_HEX(bsp[2]);
PUT_BYTE_IN_HEX(bsp[1]);
PUT_BYTE_IN_HEX(bsp[0]);
#endif
PUT_BYTE_IN_HEX((u32 >> 24) & 0xFF);
PUT_BYTE_IN_HEX((u32 >> 16) & 0xFF);
PUT_BYTE_IN_HEX((u32 >> 8) & 0xFF);
PUT_BYTE_IN_HEX(u32 & 0xFF);
}
usp++;
}