wbrawner/hoedown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve conflict

Browse source
This commit is contained in:
Devin Torres 2013-09-22 04:18:30 -05:00
commit eae29db5db
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hoedown.def
View file

@ -1,6 +1,6 @@
LIBRARY HOEDOWN LIBRARY HOEDOWN
EXPORTS EXPORTS
hoedown_autolink_issafe hoedown_autolink_is_safe
hoedown_autolink__www hoedown_autolink__www
hoedown_autolink__email hoedown_autolink__email
hoedown_autolink__url hoedown_autolink__url
@ -27,7 +27,7 @@ EXPORTS
hoedown_version hoedown_version
hoedown_stack_free hoedown_stack_free
hoedown_stack_grow hoedown_stack_grow
hoedown_stack_init hoedown_stack_new
hoedown_stack_push hoedown_stack_push
hoedown_stack_pop hoedown_stack_pop
hoedown_stack_top hoedown_stack_top

4
src/autolink.c
View file

@ -10,7 +10,7 @@
#endif #endif
int int
hoedown_autolink_issafe(const uint8_t *link, size_t link_len) hoedown_autolink_is_safe(const uint8_t *link, size_t link_len)
{ {
static const size_t valid_uris_count = 5; static const size_t valid_uris_count = 5;
static const char *valid_uris[] = { static const char *valid_uris[] = {
@ -250,7 +250,7 @@ hoedown_autolink__url(
while (rewind < max_rewind && isalpha(data[-rewind - 1])) while (rewind < max_rewind && isalpha(data[-rewind - 1]))
rewind++; rewind++;
if (!hoedown_autolink_issafe(data - rewind, size + rewind)) if (!hoedown_autolink_is_safe(data - rewind, size + rewind))
return 0; return 0;
link_end = strlen("://"); link_end = strlen("://");

2
src/autolink.h
View file

@ -14,7 +14,7 @@ enum {
}; };
int int
hoedown_autolink_issafe(const uint8_t *link, size_t link_len); hoedown_autolink_is_safe(const uint8_t *link, size_t link_len);
size_t size_t
hoedown_autolink__www(size_t *rewind_p, struct hoedown_buffer *link, hoedown_autolink__www(size_t *rewind_p, struct hoedown_buffer *link,

4
src/html.c
View file

@ -64,7 +64,7 @@ rndr_autolink(struct hoedown_buffer *ob, const struct hoedown_buffer *link, enum
return 0; return 0;
if ((options->flags & HOEDOWN_HTML_SAFELINK) != 0 && if ((options->flags & HOEDOWN_HTML_SAFELINK) != 0 &&
!hoedown_autolink_issafe(link->data, link->size) && !hoedown_autolink_is_safe(link->data, link->size) &&
type != HOEDOWN_AUTOLINK_EMAIL) type != HOEDOWN_AUTOLINK_EMAIL)
return 0; return 0;
@ -269,7 +269,7 @@ rndr_link(struct hoedown_buffer *ob, const struct hoedown_buffer *link, const st
{ {
struct hoedown_html_renderopt *options = opaque; struct hoedown_html_renderopt *options = opaque;
if (link != NULL && (options->flags & HOEDOWN_HTML_SAFELINK) != 0 && !hoedown_autolink_issafe(link->data, link->size)) if (link != NULL && (options->flags & HOEDOWN_HTML_SAFELINK) != 0 && !hoedown_autolink_is_safe(link->data, link->size))
return 0; return 0;
BUFPUTSL(ob, "<a href=\""); BUFPUTSL(ob, "<a href=\"");

4
src/markdown.c
View file

@ -2717,8 +2717,8 @@ hoedown_markdown_new(
memcpy(&md->cb, callbacks, sizeof(struct hoedown_callbacks)); memcpy(&md->cb, callbacks, sizeof(struct hoedown_callbacks));
hoedown_stack_init(&md->work_bufs[BUFFER_BLOCK], 4); hoedown_stack_new(&md->work_bufs[BUFFER_BLOCK], 4);
hoedown_stack_init(&md->work_bufs[BUFFER_SPAN], 8); hoedown_stack_new(&md->work_bufs[BUFFER_SPAN], 8);
memset(md->active_char, 0x0, 256); memset(md->active_char, 0x0, 256);

2
src/stack.c
View file

@ -40,7 +40,7 @@ hoedown_stack_free(struct hoedown_stack *st)
} }
int int
hoedown_stack_init(struct hoedown_stack *st, size_t initial_size) hoedown_stack_new(struct hoedown_stack *st, size_t initial_size)
{ {
st->item = NULL; st->item = NULL;
st->size = 0; st->size = 0;

2
src/stack.h
View file

@ -17,7 +17,7 @@ struct hoedown_stack {
void hoedown_stack_free(struct hoedown_stack *); void hoedown_stack_free(struct hoedown_stack *);
int hoedown_stack_grow(struct hoedown_stack *, size_t); int hoedown_stack_grow(struct hoedown_stack *, size_t);
int hoedown_stack_init(struct hoedown_stack *, size_t); int hoedown_stack_new(struct hoedown_stack *, size_t);
int hoedown_stack_push(struct hoedown_stack *, void *); int hoedown_stack_push(struct hoedown_stack *, void *);