Commit afc779f910e1e06c83c6977aface1bcb772bc051
2017-09-11T11:07:05
Avoid initializing strings with literals without '\0' terminator. It improves maintainability of the code and it should also fix some MSVC2015 warnings (see #26).
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
diff --git a/md4c/md4c.c b/md4c/md4c.c
index 8e07945..52efc7a 100644
--- a/md4c/md4c.c
+++ b/md4c/md4c.c
@@ -1209,16 +1209,17 @@ done:
static int
md_is_html_cdata(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg, OFF max_end, OFF* p_end)
{
- static const CHAR open_str[9] = _T("<![CDATA[");
+ static const CHAR open_str[] = _T("<![CDATA[");
+ static const SZ open_size = SIZEOF_ARRAY(open_str) - 1;
OFF off = beg;
int i = 0;
- if(off + SIZEOF_ARRAY(open_str) >= lines[0].end)
+ if(off + open_size >= lines[0].end)
return FALSE;
- if(memcmp(STR(off), open_str, sizeof(open_str)) != 0)
+ if(memcmp(STR(off), open_str, open_size) != 0)
return FALSE;
- off += SIZEOF_ARRAY(open_str);
+ off += open_size;
while(1) {
while(off + 2 < lines[i].end) {
@@ -4294,7 +4295,9 @@ abort:
static int
md_process_verbatim_block_contents(MD_CTX* ctx, MD_TEXTTYPE text_type, const MD_VERBATIMLINE* lines, int n_lines)
{
- static const CHAR indent_str[16] = _T(" ");
+ static const CHAR indent_chunk_str[] = _T(" ");
+ static const SZ indent_chunk_size = SIZEOF_ARRAY(indent_chunk_str) - 1;
+
int i;
int ret = 0;
@@ -4305,12 +4308,12 @@ md_process_verbatim_block_contents(MD_CTX* ctx, MD_TEXTTYPE text_type, const MD_
MD_ASSERT(indent >= 0);
/* Output code indentation. */
- while(indent > SIZEOF_ARRAY(indent_str)) {
- MD_TEXT(text_type, indent_str, SIZEOF_ARRAY(indent_str));
- indent -= SIZEOF_ARRAY(indent_str);
+ while(indent > SIZEOF_ARRAY(indent_chunk_str)) {
+ MD_TEXT(text_type, indent_chunk_str, indent_chunk_size);
+ indent -= SIZEOF_ARRAY(indent_chunk_str);
}
if(indent > 0)
- MD_TEXT(text_type, indent_str, indent);
+ MD_TEXT(text_type, indent_chunk_str, indent);
/* Output the code line itself. */
MD_TEXT_INSECURE(text_type, STR(line->beg), line->end - line->beg);