ox 2.10.0 → 2.10.1

data/ext/ox/ox.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef __OX_H__
-#define __OX_H__
+#ifndef OX_H
+#define OX_H
 
 #if defined(__cplusplus)
 extern "C" {
@@ -102,9 +102,9 @@ typedef enum {
     SpcSkip  = 's',
 } SkipMode;
 
-typedef struct _PInfo	*PInfo;
+typedef struct _pInfo	*PInfo;
 
-typedef struct _ParseCallbacks {
+typedef struct _parseCallbacks {
     void	(*instruct)(PInfo pi, const char *target, Attr attrs, const char *content);
     void	(*add_doctype)(PInfo pi, const char *docType);
     void	(*add_comment)(PInfo pi, const char *comment);
@@ -115,14 +115,14 @@ typedef struct _ParseCallbacks {
     void	(*finish)(PInfo pi);
 } *ParseCallbacks;
 
-typedef struct _CircArray {
+typedef struct _circArray {
     VALUE		obj_array[1024];
     VALUE		*objs;
     unsigned long	size; /* allocated size or initial array size */
     unsigned long	cnt;
 } *CircArray;
 
-typedef struct _Options {
+typedef struct _options {
     char		encoding[64];	/* encoding, stored in the option to avoid GC invalidation in default values */
     char		margin[128];	/* left margin for dumping */
     int			indent;		/* indention for dump, default 2 */
@@ -142,7 +142,7 @@ typedef struct _Options {
     char		allow_invalid;	/* YesNo */
     char		inv_repl[12];	/* max 10 valid characters, first character is the length */
     char		strip_ns[64];	/* namespace to strip, \0 is no-strip, \* is all, else only matches */
-    struct _Hints	*html_hints;	/* html hints */
+    struct _hints	*html_hints;	/* html hints */
     VALUE		attr_key_mod;
     VALUE		element_key_mod;
 #if HAS_ENCODING_SUPPORT
@@ -155,9 +155,9 @@ typedef struct _Options {
 } *Options;
 
 /* parse information structure */
-struct _PInfo {
-    struct _HelperStack	helpers;
-    struct _Err		err;
+struct _pInfo {
+    struct _helperStack	helpers;
+    struct _err		err;
     char		*str;		//buffer being read from
     char		*end;		// end of original string
     char		*s;		// current position in buffer
@@ -177,7 +177,7 @@ extern void	ox_sax_define(void);
 extern char*	ox_write_obj_to_str(VALUE obj, Options copts);
 extern void	ox_write_obj_to_file(VALUE obj, const char *path, Options copts);
 
-extern struct _Options	ox_default_options;
+extern struct _options	ox_default_options;
 
 extern VALUE	Ox;
 
@@ -276,4 +276,4 @@ extern void	ox_init_builder(VALUE ox);
 #endif
 }  /* extern "C" { */
 #endif
-#endif /* __OX_H__ */
+#endif /* OX_H */

data/ext/ox/parse.c

@@ -109,11 +109,11 @@ mark_pi_cb(void *ptr) {
 
 VALUE
 ox_parse(char *xml, size_t len, ParseCallbacks pcb, char **endp, Options options, Err err) {
-    struct _PInfo	pi;
+    struct _pInfo	pi;
     int			body_read = 0;
     int			block_given = rb_block_given_p();
     volatile VALUE	wrap;
-    
+
     if (0 == xml) {
 	set_error(err, "Invalid arg, xml string can not be null", xml, 0);
 	return Qnil;
@@ -234,7 +234,7 @@ gather_content(const char *src, char *content, size_t len) {
 static void
 read_instruction(PInfo pi) {
     char		content[1024];
-    struct _AttrStack	attrs;
+    struct _attrStack	attrs;
     char		*attr_name;
     char		*attr_value;
     char		*target;
@@ -384,7 +384,7 @@ read_comment(PInfo pi) {
     char	*s;
     char	*comment;
     int		done = 0;
-    
+
     next_non_white(pi);
     comment = pi->s;
     end = strstr(pi->s, "-->");
@@ -418,7 +418,7 @@ read_comment(PInfo pi) {
  */
 static char*
 read_element(PInfo pi) {
-    struct _AttrStack	attrs;
+    struct _attrStack	attrs;
     const char		*attr_name;
     const char		*attr_value;
     char		*name;
@@ -489,7 +489,7 @@ read_element(PInfo pi) {
 	    hasChildren = 1;
 	    done = 1;
 	    pi->pcb->add_element(pi, ename, attrs.head, hasChildren);
-	    
+
 	    break;
 	default:
 	    /* Attribute name so it's an element and the attribute will be */
@@ -539,7 +539,7 @@ read_element(PInfo pi) {
     if (hasChildren) {
 	char	*start;
 	int	first = 1;
-	
+
 	done = 0;
 	/* read children */
 	while (!done) {
@@ -609,7 +609,7 @@ read_element(PInfo pi) {
 			case CrSkip: {
 			    char	*s = start;
 			    char	*e = start;
-			
+
 			    for (; '\0' != *e; e++) {
 				if ('\r' != *e) {
 				    *s++ = *e;
@@ -708,7 +708,7 @@ read_text(PInfo pi) {
 	default:
 	    if (end <= (b + (('&' == c) ? 7 : 0))) { /* extra 8 for special just in case it is sequence of bytes */
 		unsigned long	size;
-		
+
 		if (0 == alloc_buf) {
 		    size = sizeof(buf) * 2;
 		    alloc_buf = ALLOC_N(char, size);
@@ -748,7 +748,7 @@ read_text(PInfo pi) {
 			    }
 			} else {
 			    *b++ = c;
-			}			
+			}
 			break;
 		    case NoSkip:
 		    case OffSkip:
@@ -803,7 +803,7 @@ read_reduced_text(PInfo pi) {
 	default:
 	    if (end <= (b + spc + (('&' == c) ? 7 : 0))) { /* extra 8 for special just in case it is sequence of bytes */
 		unsigned long	size;
-		
+
 		if (0 == alloc_buf) {
 		    size = sizeof(buf) * 2;
 		    alloc_buf = ALLOC_N(char, size);
@@ -905,10 +905,10 @@ read_cdata(PInfo pi) {
 static char*
 read_quoted_value(PInfo pi) {
     char	*value = 0;
-    
+
     if ('"' == *pi->s || '\'' == *pi->s) {
         char	term = *pi->s;
-        
+
         pi->s++;	/* skip quote character */
         value = pi->s;
         for (; *pi->s != term; pi->s++) {
@@ -1014,7 +1014,7 @@ read_coded_chars(PInfo pi, char *text) {
 	*text++ = '&';
     } else if ('#' == *buf) {
 	uint64_t	u = 0;
-	
+
 	b = buf + 1;
 	if ('x' == *b || 'X' == *b) {
 	    b = read_hex_uint64(b + 1, &u);
@@ -1085,7 +1085,7 @@ collapse_special(PInfo pi, char *str) {
 	if ('&' == *s) {
 	    int		c;
 	    char	*end;
-	    
+
 	    s++;
 	    if ('#' == *s) {
 		uint64_t	u = 0;

data/ext/ox/sax.c

@@ -138,7 +138,7 @@ str2sym(SaxDrive dr, const char *str, const char **strp) {
 
 void
 ox_sax_parse(VALUE handler, VALUE io, SaxOptions options) {
-    struct _SaxDrive    dr;
+    struct _saxDrive    dr;
     int			line = 0;
 
     sax_drive_init(&dr, handler, io, options);
@@ -676,7 +676,7 @@ read_cdata(SaxDrive dr) {
     int			pos = dr->buf.pos - 9;
     int			line = dr->buf.line;
     int			col = dr->buf.col - 9;
-    struct _CheckPt	cp = CHECK_PT_INIT;
+    struct _checkPt	cp = CHECK_PT_INIT;
     Nv			parent = stack_peek(&dr->stack);
 
     // TBD check parent overlay
@@ -771,7 +771,7 @@ read_comment(SaxDrive dr) {
     int			pos = dr->buf.pos - 4;
     int			line = dr->buf.line;
     int			col = dr->buf.col - 4;
-    struct _CheckPt	cp = CHECK_PT_INIT;
+    struct _checkPt	cp = CHECK_PT_INIT;
 
     buf_backup(&dr->buf); /* back up to the start in case the cdata is empty */
     buf_protect(&dr->buf);
@@ -821,7 +821,7 @@ read_comment(SaxDrive dr) {
         VALUE	args[1];
 	Nv	parent = stack_peek(&dr->stack);
 	Hint	h = ox_hint_find(dr->options.hints, "!--");
-	
+
 	if (NULL == parent || NULL == parent->hint || OffOverlay != parent->hint->overlay ||
 	    (NULL != h && (ActiveOverlay == h->overlay || ActiveOverlay == h->overlay))) {
 
@@ -1025,7 +1025,7 @@ read_element_end(SaxDrive dr) {
     int		col = dr->buf.col - 1;
     Nv		nv;
     Hint	h = NULL;
-    
+
     if ('\0' == (c = read_name_token(dr))) {
         return '\0';
     }
@@ -1241,7 +1241,7 @@ read_text(SaxDrive dr) {
 
 static int
 read_jump_term(Buf buf, const char *pat) {
-    struct _CheckPt	cp;
+    struct _checkPt	cp;
 
     buf_checkpoint(buf, &cp); // right after <
     if ('/' != buf_next_non_white(buf)) {

data/ext/ox/sax.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef __OX_SAX_H__
-#define __OX_SAX_H__
+#ifndef OX_SAX_H
+#define OX_SAX_H
 
 #include <stdbool.h>
 
@@ -14,7 +14,7 @@
 #include "sax_hint.h"
 #include "ox.h"
 
-typedef struct _SaxOptions {
+typedef struct _saxOptions {
     int			symbolize;
     int			convert_special;
     int			smart;
@@ -23,16 +23,16 @@ typedef struct _SaxOptions {
     Hints		hints;
 } *SaxOptions;
 
-typedef struct _SaxDrive {
-    struct _Buf		buf;
-    struct _NStack	stack;	/* element name stack */
+typedef struct _saxDrive {
+    struct _buf		buf;
+    struct _nStack	stack;	/* element name stack */
     VALUE		handler;
     VALUE		value_obj;
-    struct _SaxOptions	options;
+    struct _saxOptions	options;
     int			err;
     int			blocked;
     bool		abort;
-    struct _Has		has;
+    struct _has		has;
 #if HAS_ENCODING_SUPPORT
     rb_encoding *encoding;
 #elif HAS_PRIVATE_ENCODING
@@ -52,4 +52,4 @@ extern VALUE	ox_sax_value_class;
 
 extern VALUE	str2sym(SaxDrive dr, const char *str, const char **strp);
 
-#endif /* __OX_SAX_H__ */
+#endif /* OX_SAX_H */

data/ext/ox/sax_as.c

@@ -9,7 +9,7 @@
 #include <strings.h>
 #include <sys/types.h>
 #if NEEDS_UIO
-#include <sys/uio.h>    
+#include <sys/uio.h>
 #endif
 #include <unistd.h>
 #include <time.h>
@@ -24,7 +24,7 @@ parse_double_time(const char *text) {
     long        v2 = 0;
     const char  *dot = 0;
     char        c;
-    
+
     for (; '.' != *text; text++) {
         c = *text;
         if (c < '0' || '9' < c) {
@@ -50,7 +50,7 @@ parse_double_time(const char *text) {
 #endif
 }
 
-typedef struct _Tp {
+typedef struct _tp {
     int         cnt;
     char        end;
     char        alt;
@@ -63,7 +63,7 @@ parse_xsd_time(const char *text) {
     long        v;
     int         i;
     char        c = '\0';
-    struct _Tp  tpa[10] = { { 4, '-', '-' },
+    struct _tp  tpa[10] = { { 4, '-', '-' },
                            { 2, '-', '-' },
                            { 2, 'T', ' ' },
                            { 2, ':', ':' },

data/ext/ox/sax_buf.h

@@ -3,10 +3,10 @@
  * All rights reserved.
  */
 
-#ifndef __OX_SAX_BUF_H__
-#define __OX_SAX_BUF_H__
+#ifndef OX_SAX_BUF_H
+#define OX_SAX_BUF_H
 
-typedef struct _Buf {
+typedef struct _buf {
     char	base[0x00001000];
     char	*head;
     char	*end;
@@ -20,16 +20,16 @@ typedef struct _Buf {
     int		pro_pos;
     int		pro_line;
     int		pro_col;
-    int		(*read_func)(struct _Buf *buf);
+    int		(*read_func)(struct _buf *buf);
     union {
         int     	fd;
         VALUE   	io;
 	const char	*str;
     } in;
-    struct _SaxDrive	*dr;
+    struct _saxDrive	*dr;
 } *Buf;
 
-typedef struct _CheckPt {
+typedef struct _checkPt {
     int		pro_dif;
     int		pos;
     int		line;
@@ -219,4 +219,4 @@ buf_collapse_white(char *str) {
     *back = '\0';
 }
 
-#endif /* __OX_SAX_BUF_H__ */
+#endif /* OX_SAX_BUF_H */

data/ext/ox/sax_has.h

@@ -3,10 +3,10 @@
  * All rights reserved.
  */
 
-#ifndef __OX_SAX_HAS_H__
-#define __OX_SAX_HAS_H__
+#ifndef OX_SAX_HAS_H
+#define OX_SAX_HAS_H
 
-typedef struct _Has {
+typedef struct _has {
     int         instruct;
     int         end_instruct;
     int         attr;
@@ -50,4 +50,4 @@ has_init(Has has, VALUE handler) {
     has->column = (Qtrue == rb_ivar_defined(handler, ox_at_column_id));
 }
 
-#endif /* __OX_SAX_HAS_H__ */
+#endif /* OX_SAX_HAS_H */

data/ext/ox/sax_hint.c

@@ -28,7 +28,7 @@ static const char	*ruby_0[] = { "ruby", 0 };
 static const char	*table_0[] = { "table", 0 };
 static const char	*tr_0[] = { "tr", 0 };
 
-static struct _Hint	html_hint_array[] = {
+static struct _hint	html_hint_array[] = {
     { "!--", false, false, false, ActiveOverlay, NULL }, // comment
     { "a", false, false, false, ActiveOverlay, NULL },
     { "abbr", false, false, false, ActiveOverlay, NULL },
@@ -152,7 +152,7 @@ static struct _Hint	html_hint_array[] = {
     { "video", false, false, false, ActiveOverlay, NULL },
     { "wbr", true, false, false, ActiveOverlay, NULL },
 };
-static struct _Hints	html_hints = {
+static struct _hints	html_hints = {
     "HTML",
     html_hint_array,
     sizeof(html_hint_array) / sizeof(*html_hint_array)
@@ -165,13 +165,13 @@ ox_hints_html() {
 
 Hints
 ox_hints_dup(Hints h) {
-    Hints	nh = ALLOC(struct _Hints);
+    Hints	nh = ALLOC(struct _hints);
 
-    nh->hints = ALLOC_N(struct _Hint, h->size);
-    memcpy(nh->hints, h->hints, sizeof(struct _Hint) * h->size);
+    nh->hints = ALLOC_N(struct _hint, h->size);
+    memcpy(nh->hints, h->hints, sizeof(struct _hint) * h->size);
     nh->size = h->size;
     nh->name = h->name;
-    
+
     return nh;
 }
 

data/ext/ox/sax_hint.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef __OX_HINT_H__
-#define __OX_HINT_H__
+#ifndef OX_HINT_H
+#define OX_HINT_H
 
 #include <stdbool.h>
 
@@ -17,7 +17,7 @@ typedef enum {
     NestOverlay		= 'n', // nest flag is ignored
 } Overlay;
 
-typedef struct _Hint {
+typedef struct _hint {
     const char	*name;
     char	empty;	// must be closed or close auto it, not error
     char	nest;	// nesting allowed
@@ -26,7 +26,7 @@ typedef struct _Hint {
     const char	**parents;
 } *Hint;
 
-typedef struct _Hints {
+typedef struct _hints {
     const char	*name;
     Hint	hints; // array of hints
     int		size;
@@ -37,4 +37,4 @@ extern Hint	ox_hint_find(Hints hints, const char *name);
 extern Hints	ox_hints_dup(Hints h);
 extern void	ox_hints_destroy(Hints h);
 
-#endif /* __OX_HINT_H__ */
+#endif /* OX_HINT_H */