Fossil SCM
Change blob_zero() calls to blob_reset() in markdown.c. Fix over-length lines in markdown.c.
Commit
736006d1214771384900304c166b72eb0e610338
Parent
d93f5ee3e64eb9c…
1 file changed
+16
-10
+16
-10
| --- src/markdown.c | ||
| +++ src/markdown.c | ||
| @@ -842,11 +842,13 @@ | ||
| 842 | 842 | return end; |
| 843 | 843 | } |
| 844 | 844 | } |
| 845 | 845 | |
| 846 | 846 | |
| 847 | -/* get_link_inline -- extract inline-style link and title from parenthesed data*/ | |
| 847 | +/* get_link_inline -- extract inline-style link and title from | |
| 848 | +** parenthesed data | |
| 849 | +*/ | |
| 848 | 850 | static int get_link_inline( |
| 849 | 851 | struct Blob *link, |
| 850 | 852 | struct Blob *title, |
| 851 | 853 | char *data, |
| 852 | 854 | size_t size |
| @@ -1522,11 +1524,11 @@ | ||
| 1522 | 1524 | if( !inter ){ |
| 1523 | 1525 | if( rndr->make.listitem ){ |
| 1524 | 1526 | rndr->make.listitem(ob, work, *flags, rndr->make.opaque); |
| 1525 | 1527 | } |
| 1526 | 1528 | if( work!=&fallback ) release_work_buffer(rndr, work); |
| 1527 | - blob_zero(&fallback); | |
| 1529 | + blob_reset(&fallback); | |
| 1528 | 1530 | return beg; |
| 1529 | 1531 | } |
| 1530 | 1532 | |
| 1531 | 1533 | /* render of li contents */ |
| 1532 | 1534 | if( has_inside_empty ) *flags |= MKD_LI_BLOCK; |
| @@ -1558,11 +1560,11 @@ | ||
| 1558 | 1560 | if( rndr->make.listitem ){ |
| 1559 | 1561 | rndr->make.listitem(ob, inter, *flags, rndr->make.opaque); |
| 1560 | 1562 | } |
| 1561 | 1563 | release_work_buffer(rndr, inter); |
| 1562 | 1564 | if( work!=&fallback ) release_work_buffer(rndr, work); |
| 1563 | - blob_zero(&fallback); | |
| 1565 | + blob_reset(&fallback); | |
| 1564 | 1566 | return beg; |
| 1565 | 1567 | } |
| 1566 | 1568 | |
| 1567 | 1569 | |
| 1568 | 1570 | /* parse_list -- parsing ordered or unordered list block */ |
| @@ -1584,11 +1586,11 @@ | ||
| 1584 | 1586 | if( !j || (flags & MKD_LI_END) ) break; |
| 1585 | 1587 | } |
| 1586 | 1588 | |
| 1587 | 1589 | if( rndr->make.list ) rndr->make.list(ob, work, flags, rndr->make.opaque); |
| 1588 | 1590 | if( work!=&fallback ) release_work_buffer(rndr, work); |
| 1589 | - blob_zero(&fallback); | |
| 1591 | + blob_reset(&fallback); | |
| 1590 | 1592 | return i; |
| 1591 | 1593 | } |
| 1592 | 1594 | |
| 1593 | 1595 | |
| 1594 | 1596 | /* parse_atxheader -- parsing of atx-style headers */ |
| @@ -1631,11 +1633,15 @@ | ||
| 1631 | 1633 | } |
| 1632 | 1634 | |
| 1633 | 1635 | |
| 1634 | 1636 | /* htmlblock_end -- checking end of HTML block : </tag>[ \t]*\n[ \t*]\n */ |
| 1635 | 1637 | /* returns the length on match, 0 otherwise */ |
| 1636 | -static size_t htmlblock_end(const struct html_tag *tag, const char *data, size_t size){ | |
| 1638 | +static size_t htmlblock_end( | |
| 1639 | + const struct html_tag *tag, | |
| 1640 | + const char *data, | |
| 1641 | + size_t size | |
| 1642 | +){ | |
| 1637 | 1643 | size_t i, w; |
| 1638 | 1644 | |
| 1639 | 1645 | /* assuming data[0]=='<' && data[1]=='/' already tested */ |
| 1640 | 1646 | |
| 1641 | 1647 | /* checking tag is a match */ |
| @@ -2224,17 +2230,17 @@ | ||
| 2224 | 2230 | if( rndr.make.prolog ) rndr.make.prolog(ob, rndr.make.opaque); |
| 2225 | 2231 | parse_block(ob, &rndr, blob_buffer(&text), blob_size(&text)); |
| 2226 | 2232 | if( rndr.make.epilog ) rndr.make.epilog(ob, rndr.make.opaque); |
| 2227 | 2233 | |
| 2228 | 2234 | /* clean-up */ |
| 2229 | - blob_zero(&text); | |
| 2235 | + blob_reset(&text); | |
| 2230 | 2236 | lr = (struct link_ref *)blob_buffer(&rndr.refs); |
| 2231 | 2237 | end = blob_size(&rndr.refs)/sizeof(struct link_ref); |
| 2232 | 2238 | for(i=0; i<end; i++){ |
| 2233 | - blob_zero(&lr[i].id); | |
| 2234 | - blob_zero(&lr[i].link); | |
| 2235 | - blob_zero(&lr[i].title); | |
| 2239 | + blob_reset(&lr[i].id); | |
| 2240 | + blob_reset(&lr[i].link); | |
| 2241 | + blob_reset(&lr[i].title); | |
| 2236 | 2242 | } |
| 2237 | - blob_zero(&rndr.refs); | |
| 2243 | + blob_reset(&rndr.refs); | |
| 2238 | 2244 | blobarray_zero(rndr.work, rndr.make.max_work_stack); |
| 2239 | 2245 | fossil_free(rndr.work); |
| 2240 | 2246 | } |
| 2241 | 2247 |
| --- src/markdown.c | |
| +++ src/markdown.c | |
| @@ -842,11 +842,13 @@ | |
| 842 | return end; |
| 843 | } |
| 844 | } |
| 845 | |
| 846 | |
| 847 | /* get_link_inline -- extract inline-style link and title from parenthesed data*/ |
| 848 | static int get_link_inline( |
| 849 | struct Blob *link, |
| 850 | struct Blob *title, |
| 851 | char *data, |
| 852 | size_t size |
| @@ -1522,11 +1524,11 @@ | |
| 1522 | if( !inter ){ |
| 1523 | if( rndr->make.listitem ){ |
| 1524 | rndr->make.listitem(ob, work, *flags, rndr->make.opaque); |
| 1525 | } |
| 1526 | if( work!=&fallback ) release_work_buffer(rndr, work); |
| 1527 | blob_zero(&fallback); |
| 1528 | return beg; |
| 1529 | } |
| 1530 | |
| 1531 | /* render of li contents */ |
| 1532 | if( has_inside_empty ) *flags |= MKD_LI_BLOCK; |
| @@ -1558,11 +1560,11 @@ | |
| 1558 | if( rndr->make.listitem ){ |
| 1559 | rndr->make.listitem(ob, inter, *flags, rndr->make.opaque); |
| 1560 | } |
| 1561 | release_work_buffer(rndr, inter); |
| 1562 | if( work!=&fallback ) release_work_buffer(rndr, work); |
| 1563 | blob_zero(&fallback); |
| 1564 | return beg; |
| 1565 | } |
| 1566 | |
| 1567 | |
| 1568 | /* parse_list -- parsing ordered or unordered list block */ |
| @@ -1584,11 +1586,11 @@ | |
| 1584 | if( !j || (flags & MKD_LI_END) ) break; |
| 1585 | } |
| 1586 | |
| 1587 | if( rndr->make.list ) rndr->make.list(ob, work, flags, rndr->make.opaque); |
| 1588 | if( work!=&fallback ) release_work_buffer(rndr, work); |
| 1589 | blob_zero(&fallback); |
| 1590 | return i; |
| 1591 | } |
| 1592 | |
| 1593 | |
| 1594 | /* parse_atxheader -- parsing of atx-style headers */ |
| @@ -1631,11 +1633,15 @@ | |
| 1631 | } |
| 1632 | |
| 1633 | |
| 1634 | /* htmlblock_end -- checking end of HTML block : </tag>[ \t]*\n[ \t*]\n */ |
| 1635 | /* returns the length on match, 0 otherwise */ |
| 1636 | static size_t htmlblock_end(const struct html_tag *tag, const char *data, size_t size){ |
| 1637 | size_t i, w; |
| 1638 | |
| 1639 | /* assuming data[0]=='<' && data[1]=='/' already tested */ |
| 1640 | |
| 1641 | /* checking tag is a match */ |
| @@ -2224,17 +2230,17 @@ | |
| 2224 | if( rndr.make.prolog ) rndr.make.prolog(ob, rndr.make.opaque); |
| 2225 | parse_block(ob, &rndr, blob_buffer(&text), blob_size(&text)); |
| 2226 | if( rndr.make.epilog ) rndr.make.epilog(ob, rndr.make.opaque); |
| 2227 | |
| 2228 | /* clean-up */ |
| 2229 | blob_zero(&text); |
| 2230 | lr = (struct link_ref *)blob_buffer(&rndr.refs); |
| 2231 | end = blob_size(&rndr.refs)/sizeof(struct link_ref); |
| 2232 | for(i=0; i<end; i++){ |
| 2233 | blob_zero(&lr[i].id); |
| 2234 | blob_zero(&lr[i].link); |
| 2235 | blob_zero(&lr[i].title); |
| 2236 | } |
| 2237 | blob_zero(&rndr.refs); |
| 2238 | blobarray_zero(rndr.work, rndr.make.max_work_stack); |
| 2239 | fossil_free(rndr.work); |
| 2240 | } |
| 2241 |
| --- src/markdown.c | |
| +++ src/markdown.c | |
| @@ -842,11 +842,13 @@ | |
| 842 | return end; |
| 843 | } |
| 844 | } |
| 845 | |
| 846 | |
| 847 | /* get_link_inline -- extract inline-style link and title from |
| 848 | ** parenthesed data |
| 849 | */ |
| 850 | static int get_link_inline( |
| 851 | struct Blob *link, |
| 852 | struct Blob *title, |
| 853 | char *data, |
| 854 | size_t size |
| @@ -1522,11 +1524,11 @@ | |
| 1524 | if( !inter ){ |
| 1525 | if( rndr->make.listitem ){ |
| 1526 | rndr->make.listitem(ob, work, *flags, rndr->make.opaque); |
| 1527 | } |
| 1528 | if( work!=&fallback ) release_work_buffer(rndr, work); |
| 1529 | blob_reset(&fallback); |
| 1530 | return beg; |
| 1531 | } |
| 1532 | |
| 1533 | /* render of li contents */ |
| 1534 | if( has_inside_empty ) *flags |= MKD_LI_BLOCK; |
| @@ -1558,11 +1560,11 @@ | |
| 1560 | if( rndr->make.listitem ){ |
| 1561 | rndr->make.listitem(ob, inter, *flags, rndr->make.opaque); |
| 1562 | } |
| 1563 | release_work_buffer(rndr, inter); |
| 1564 | if( work!=&fallback ) release_work_buffer(rndr, work); |
| 1565 | blob_reset(&fallback); |
| 1566 | return beg; |
| 1567 | } |
| 1568 | |
| 1569 | |
| 1570 | /* parse_list -- parsing ordered or unordered list block */ |
| @@ -1584,11 +1586,11 @@ | |
| 1586 | if( !j || (flags & MKD_LI_END) ) break; |
| 1587 | } |
| 1588 | |
| 1589 | if( rndr->make.list ) rndr->make.list(ob, work, flags, rndr->make.opaque); |
| 1590 | if( work!=&fallback ) release_work_buffer(rndr, work); |
| 1591 | blob_reset(&fallback); |
| 1592 | return i; |
| 1593 | } |
| 1594 | |
| 1595 | |
| 1596 | /* parse_atxheader -- parsing of atx-style headers */ |
| @@ -1631,11 +1633,15 @@ | |
| 1633 | } |
| 1634 | |
| 1635 | |
| 1636 | /* htmlblock_end -- checking end of HTML block : </tag>[ \t]*\n[ \t*]\n */ |
| 1637 | /* returns the length on match, 0 otherwise */ |
| 1638 | static size_t htmlblock_end( |
| 1639 | const struct html_tag *tag, |
| 1640 | const char *data, |
| 1641 | size_t size |
| 1642 | ){ |
| 1643 | size_t i, w; |
| 1644 | |
| 1645 | /* assuming data[0]=='<' && data[1]=='/' already tested */ |
| 1646 | |
| 1647 | /* checking tag is a match */ |
| @@ -2224,17 +2230,17 @@ | |
| 2230 | if( rndr.make.prolog ) rndr.make.prolog(ob, rndr.make.opaque); |
| 2231 | parse_block(ob, &rndr, blob_buffer(&text), blob_size(&text)); |
| 2232 | if( rndr.make.epilog ) rndr.make.epilog(ob, rndr.make.opaque); |
| 2233 | |
| 2234 | /* clean-up */ |
| 2235 | blob_reset(&text); |
| 2236 | lr = (struct link_ref *)blob_buffer(&rndr.refs); |
| 2237 | end = blob_size(&rndr.refs)/sizeof(struct link_ref); |
| 2238 | for(i=0; i<end; i++){ |
| 2239 | blob_reset(&lr[i].id); |
| 2240 | blob_reset(&lr[i].link); |
| 2241 | blob_reset(&lr[i].title); |
| 2242 | } |
| 2243 | blob_reset(&rndr.refs); |
| 2244 | blobarray_zero(rndr.work, rndr.make.max_work_stack); |
| 2245 | fossil_free(rndr.work); |
| 2246 | } |
| 2247 |