From cb6e3eb18a170a342bd1dbd740a5c4468eb2575a Mon Sep 17 00:00:00 2001 From: cel Date: Fri, 9 Oct 2020 12:09:46 -0400 Subject: [PATCH] Satisfy compiler warnings --- sundown/autolink.c | 15 +++++++++++---- sundown/markdown.c | 9 ++++++++- zet.dpi.c | 2 +- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/sundown/autolink.c b/sundown/autolink.c index ceaf530..db614de 100644 --- a/sundown/autolink.c +++ b/sundown/autolink.c @@ -70,6 +70,8 @@ autolink_delim(uint8_t *data, size_t link_end, size_t max_rewind, size_t size) { uint8_t cclose, copen = 0; size_t i; + (void)max_rewind; + (void)size; for (i = 0; i < link_end; ++i) if (data[i] == '<') { @@ -184,6 +186,7 @@ sd_autolink__www( size_t size, unsigned int flags) { + (void)flags; size_t link_end; if (max_rewind > 0 && !ispunct(data[-1]) && !isspace(data[-1])) @@ -222,6 +225,7 @@ sd_autolink__email( { size_t link_end, rewind; int nb = 0, np = 0; + (void)flags; for (rewind = 0; rewind < max_rewind; ++rewind) { uint8_t c = data[-rewind - 1]; @@ -321,11 +325,12 @@ sd_autolink__zet( size_t size, unsigned int flags) { - size_t link_end, rewind = 0, domain_len; + size_t link_end, rewind = 0; + (void)flags; - static const char sigil_size = sizeof("§")-1; + static const size_t sigil_size = sizeof("§")-1; - if (size < sigil_size || strncmp(data, "§", sigil_size)) + if (size < sigil_size || strncmp((char *)data, "§", sigil_size)) return 0; while (rewind < max_rewind && isalpha(data[-rewind - 1])) @@ -354,8 +359,10 @@ sd_autolink__ssb( size_t size, unsigned int flags) { - size_t link_end = 1, rewind = 0, domain_len; + size_t link_end = 1, rewind = 0; char sigil = data[0]; + (void)flags; + (void)max_rewind; if (sigil == '#') { while (link_end < size && isdigit(data[link_end])) diff --git a/sundown/markdown.c b/sundown/markdown.c index 7b8badf..17d6a01 100644 --- a/sundown/markdown.c +++ b/sundown/markdown.c @@ -639,6 +639,7 @@ char_emphasis(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t of static size_t char_linebreak(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size) { + (void)data, (void)offset, (void)size; /* removing the last space from ob and rendering */ while (ob->size && ob->data[ob->size - 1] == ' ') ob->size--; @@ -652,6 +653,7 @@ static size_t char_codespan(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size) { size_t end, nb = 0, i, f_begin, f_end; + (void)offset; /* counting the number of backticks in the delimiter */ while (nb < size && data[nb] == '`') @@ -696,6 +698,7 @@ char_escape(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offs { static const char *escape_chars = "\\`*_{}[]()#+-.!:|&<>^~"; struct buf work = { 0, 0, 0, 0 }; + (void)offset; if (size > 1) { if (strchr(escape_chars, data[1]) == NULL) @@ -721,6 +724,7 @@ char_entity(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offs { size_t end = 1; struct buf work = { 0, 0, 0, 0 }; + (void)offset; if (end < size && data[end] == '#') end++; @@ -751,6 +755,7 @@ char_langle_tag(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size_t end = tag_length(data, size, &altype); struct buf work = { data, end, 0, 0 }; int ret = 0; + (void)offset; if (end > 2) { if (rndr->cb.autolink && altype != MKDA_NOT_AUTOLINK) { @@ -1133,6 +1138,7 @@ char_superscript(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t { size_t sup_start, sup_len; struct buf *sup; + (void)offset; if (!rndr->cb.superscript) return 0; @@ -1886,6 +1892,7 @@ htmlblock_end_tag( size_t size) { size_t i, w; + (void)rndr; /* checking if tag is a match */ if (tag_len + 3 >= size || @@ -2513,7 +2520,7 @@ void sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, struct sd_markdown *md) { #define MARKDOWN_GROW(x) ((x) + ((x) >> 1)) - static const char UTF8_BOM[] = {0xEF, 0xBB, 0xBF}; + static const unsigned char UTF8_BOM[] = {0xEF, 0xBB, 0xBF}; struct buf *text; size_t beg, end; diff --git a/zet.dpi.c b/zet.dpi.c index a555361..b292f05 100644 --- a/zet.dpi.c +++ b/zet.dpi.c @@ -970,7 +970,7 @@ static int save_part(struct http_request *req, int note_fd) { if (req->add_new_id) { char id[72] = "\n§"; generate_id(id + 1 + sigil_size); - rc |= write_all(note_fd, id, strlen(id)); + rc |= write_all(note_fd, (unsigned char *)id, strlen(id)); } rc |= close(note_fd); free(req->full_data);