redcarpet 1.11.1 → 1.11.2

data/ext/buffer.c

@@ -23,7 +23,6 @@
  */
 
 #define BUFFER_STDARG
-#define BUFFER_MAX_ALLOC_SIZE (1024 * 1024 * 16) //16mb
 
 #include "buffer.h"
 
@@ -148,25 +147,6 @@ bufdup(const struct buf *src, size_t dupunit) {
 #endif
 	return ret; }
 
-/* bufgrow • increasing the allocated size to the given value */
-int
-bufgrow(struct buf *buf, size_t neosz) {
-	size_t neoasz;
-	void *neodata;
-	if (!buf || !buf->unit || neosz > BUFFER_MAX_ALLOC_SIZE) return 0;
-	if (buf->asize >= neosz) return 1;
-	neoasz = buf->asize + buf->unit;
-	while (neoasz < neosz) neoasz += buf->unit;
-	neodata = realloc(buf->data, neoasz);
-	if (!neodata) return 0;
-#ifdef BUFFER_STATS
-	buffer_stat_alloc_bytes += (neoasz - buf->asize);
-#endif
-	buf->data = neodata;
-	buf->asize = neoasz;
-	return 1; }
-
-
 /* bufnew • allocation of a new buffer */
 struct buf *
 bufnew(size_t unit) {
@@ -216,18 +196,10 @@ bufputs(struct buf *buf, const char *str) {
 	bufput(buf, str, strlen (str)); }
 
 
-/* bufputc • appends a single char to a buffer */
-void
-bufputc(struct buf *buf, char c) {
-	if (!buf || !bufgrow(buf, buf->size + 1)) return;
-	buf->data[buf->size] = c;
-	buf->size += 1; }
-
-
 /* bufrelease • decrease the reference count and free the buffer if needed */
 void
 bufrelease(struct buf *buf) {
-	if (!buf || !buf->unit || !buf->asize) return;
+	if (!buf) return;
 	buf->ref -= 1;
 	if (buf->ref == 0) {
 #ifdef BUFFER_STATS
@@ -241,7 +213,7 @@ bufrelease(struct buf *buf) {
 /* bufreset • frees internal data of the buffer */
 void
 bufreset(struct buf *buf) {
-	if (!buf || !buf->unit || !buf->asize) return;
+	if (!buf) return;
 #ifdef BUFFER_STATS
 	buffer_stat_alloc_bytes -= buf->asize;
 #endif

data/ext/buffer.h

@@ -21,6 +21,7 @@
 
 #include <stddef.h>
 
+#define BUFFER_MAX_ALLOC_SIZE (1024 * 1024 * 16) /* 16mb */
 
 /********************
  * TYPE DEFINITIONS *
@@ -81,10 +82,6 @@ struct buf *
 bufdup(const struct buf *, size_t)
 	__attribute__ ((malloc));
 
-/* bufgrow • increasing the allocated size to the given value */
-int
-bufgrow(struct buf *, size_t);
-
 /* bufnew • allocation of a new buffer */
 struct buf *
 bufnew(size_t)
@@ -107,10 +104,6 @@ bufput(struct buf *, const void*, size_t);
 void
 bufputs(struct buf *, const char*);
 
-/* bufputc • appends a single char to a buffer */
-void
-bufputc(struct buf *, char);
-
 /* bufrelease • decrease the reference count and free the buffer if needed */
 void
 bufrelease(struct buf *);
@@ -142,6 +135,33 @@ vbufprintf(struct buf *, const char*, va_list);
 
 #endif /* def BUFFER_STDARG */
 
+#include <stdlib.h>
+
+/* bufgrow • increasing the allocated size to the given value */
+static inline int
+bufgrow(struct buf *buf, size_t neosz) {
+	size_t neoasz;
+	void *neodata;
+	if (!buf || !buf->unit || neosz > BUFFER_MAX_ALLOC_SIZE) return 0;
+	if (buf->asize >= neosz) return 1;
+	neoasz = buf->asize + buf->unit;
+	while (neoasz < neosz) neoasz += buf->unit;
+	neodata = realloc(buf->data, neoasz);
+	if (!neodata) return 0;
+#ifdef BUFFER_STATS
+	buffer_stat_alloc_bytes += (neoasz - buf->asize);
+#endif
+	buf->data = neodata;
+	buf->asize = neoasz;
+	return 1; }
+
+/* bufputc • appends a single char to a buffer */
+static inline void
+bufputc(struct buf *buf, char c) {
+	if (!buf || !bufgrow(buf, buf->size + 1)) return;
+	buf->data[buf->size] = c;
+	buf->size += 1; }
+
 #endif /* ndef LITHIUM_BUFFER_H */
 
 /* vim: set filetype=c: */

data/ext/markdown.c

@@ -1947,7 +1947,7 @@ static void expand_tabs(struct buf *ob, const char *line, size_t size)
 void
 ups_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer, unsigned int extensions) {
 	struct link_ref *lr;
-	struct buf *text = bufnew(TEXT_UNIT);
+	struct buf *text;
 	size_t i, beg, end;
 	struct render rndr;
 
@@ -1955,6 +1955,10 @@ ups_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer,
 	if (!rndrer)
 		return;
 
+	text = bufnew(TEXT_UNIT);
+	if (!text)
+		return;
+
 	rndr.make = *rndrer;
 	arr_init(&rndr.refs, sizeof (struct link_ref));
 	parr_init(&rndr.work);
@@ -2027,7 +2031,7 @@ ups_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer,
 
 	/* adding a final newline if not already present */
 	if (!text->size)
-		return;
+		goto cleanup;
 
 	if (text->data[text->size - 1] != '\n' &&  text->data[text->size - 1] != '\r')
 		bufputc(text, '\n');
@@ -2042,6 +2046,7 @@ ups_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer,
 		rndr.make.doc_footer(ob, rndr.make.opaque);
 
 	/* clean-up */
+cleanup:
 	bufrelease(text);
 	lr = rndr.refs.base;
 	for (i = 0; i < (size_t)rndr.refs.size; i += 1) {

data/lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.11.1'
+  VERSION = '1.11.2'
 
   # Original Markdown formatted text.
   attr_reader :text

data/redcarpet.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '1.11.1'
+  s.version = '1.11.2'
   s.summary = "Ruby bindings for libupskirt"
   s.description = 'A fast and safe Markdown to (X)HTML parser'
-  s.date = '2011-04-25'
+  s.date = '2011-04-26'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/tanoku/redcarpet'
   s.has_rdoc = true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 1
   - 11
-  - 1
-  version: 1.11.1
+  - 2
+  version: 1.11.2
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 +03:00
+date: 2011-04-26 00:00:00 +03:00
 default_executable: 
 dependencies: []