Permalink
Browse files

Fixed discount.vcproj.filters.

Merge branch 'discountlib_master' (but discarding the NULL pointer on empty result option for mkd_css and mkd_toc).

Conflicts:
	lib/css.c
	lib/tests/html.t
	lib/toc.c
  • Loading branch information...
cataphract committed Jan 6, 2011
2 parents 18d6b44 + b865867 commit 8425c72b9e182a12e50375eff7a30bc4aa449a78
Showing with 9 additions and 11 deletions.
  1. +2 −5 discount.vcxproj.filters
  2. +1 −1 lib/VERSION
  3. +1 −1 lib/css.c
  4. +1 −1 lib/emmatch.c
  5. +4 −3 lib/toc.c
View
@@ -89,13 +89,10 @@
</ClCompile>
<ClCompile Include="markdowndoc_meth_callbacks.c">
<Filter>Source Files</Filter>
- </ClCompile>
-<<<<<<< HEAD
-=======
+ </ClCompile>
<ClCompile Include="lib\setup.c">
<Filter>Source Files</Filter>
- </ClCompile>
->>>>>>> 2ba9082cee8f2c7bdf6c93a67ff6438ee4af1a58
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="php_discount.h">
View
@@ -1 +1 @@
-2.0.4beta3
+2.0.4beta4
View
@@ -52,7 +52,7 @@ mkd_css(Document *d, char **res)
CREATE(f);
RESERVE(f, 100);
stylesheets(d->code, &f);
-
+
/* on merge: on empty output, null termination (i.e. null termination always) */
size = S(f);
EXPAND(f) = 0;
View
@@ -163,7 +163,7 @@ emblock(MMIOT *f, int first, int last)
} /* emblock */
-/* ___mkd_emblock() -- emblock a string of blocks, then concatinate the
+/* ___mkd_emblock() -- emblock a string of blocks, then concatenate the
* resulting text onto f->out.
*/
void
View
@@ -23,9 +23,10 @@ mkd_toc(Document *p, char **doc)
Cstring res;
int size;
- *doc = 0;
+ if ( !(doc && p && p->ctx) ) return -1;
- if ( !(p && p->ctx) ) return -1;
+ *doc = 0;
+
if ( ! (p->ctx->flags & MKD_TOC) ) return 0;
CREATE(res);
@@ -70,7 +71,7 @@ mkd_toc(Document *p, char **doc)
if ( (size = S(res)) == 0 )
EXPAND(res) = 0;
/* HACK ALERT! HACK ALERT! HACK ALERT! */
- *doc = T(res); /* we know that a T(Cstring) is a character pointer
+ *doc = T(res); /* we know that a T(Cstring) is a character pointer
* so we can simply pick it up and carry it away,
* leaving the husk of the Ctring on the stack
* END HACK ALERT

0 comments on commit 8425c72

Please sign in to comment.