From c0b89ac5bfb90835ef01573267020e42d4fe070c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 23 Aug 2015 12:17:05 +0200 Subject: Imported Upstream version 1.8.0 --- yajl/COPYING | 0 yajl/ChangeLog | 0 yajl/Jamfile | 0 yajl/README | 0 yajl/TODO | 0 yajl/afiles | 0 yajl/json_verify.c | 0 yajl/yajl.c | 0 yajl/yajl.h | 0 yajl/yajl_alloc.c | 0 yajl/yajl_alloc.h | 0 yajl/yajl_buf.c | 0 yajl/yajl_buf.h | 0 yajl/yajl_bytestack.h | 0 yajl/yajl_common.h | 0 yajl/yajl_encode.c | 0 yajl/yajl_encode.h | 0 yajl/yajl_gen.c | 8 ++++---- yajl/yajl_gen.h | 0 yajl/yajl_lex.c | 0 yajl/yajl_lex.h | 0 yajl/yajl_parse.h | 0 yajl/yajl_parser.c | 12 ++++++------ yajl/yajl_parser.h | 0 yajl/yajl_test.c | 0 yajl/yajl_test.exe | Bin 57828 -> 0 bytes yajl/yajl_test.obj | Bin 6464 -> 0 bytes yajl/yajl_tree.c | 0 yajl/yajl_tree.h | 3 +++ yajl/yajl_version.c | 0 yajl/yajl_version.h | 0 31 files changed, 13 insertions(+), 10 deletions(-) mode change 100644 => 100755 yajl/COPYING mode change 100644 => 100755 yajl/ChangeLog mode change 100644 => 100755 yajl/Jamfile mode change 100644 => 100755 yajl/README mode change 100644 => 100755 yajl/TODO mode change 100644 => 100755 yajl/afiles mode change 100644 => 100755 yajl/json_verify.c mode change 100644 => 100755 yajl/yajl.c mode change 100644 => 100755 yajl/yajl.h mode change 100644 => 100755 yajl/yajl_alloc.c mode change 100644 => 100755 yajl/yajl_alloc.h mode change 100644 => 100755 yajl/yajl_buf.c mode change 100644 => 100755 yajl/yajl_buf.h mode change 100644 => 100755 yajl/yajl_bytestack.h mode change 100644 => 100755 yajl/yajl_common.h mode change 100644 => 100755 yajl/yajl_encode.c mode change 100644 => 100755 yajl/yajl_encode.h mode change 100644 => 100755 yajl/yajl_gen.c mode change 100644 => 100755 yajl/yajl_gen.h mode change 100644 => 100755 yajl/yajl_lex.c mode change 100644 => 100755 yajl/yajl_lex.h mode change 100644 => 100755 yajl/yajl_parse.h mode change 100644 => 100755 yajl/yajl_parser.c mode change 100644 => 100755 yajl/yajl_parser.h mode change 100644 => 100755 yajl/yajl_test.c delete mode 100644 yajl/yajl_test.exe delete mode 100644 yajl/yajl_test.obj mode change 100644 => 100755 yajl/yajl_tree.c mode change 100644 => 100755 yajl/yajl_tree.h mode change 100644 => 100755 yajl/yajl_version.c mode change 100644 => 100755 yajl/yajl_version.h (limited to 'yajl') diff --git a/yajl/COPYING b/yajl/COPYING old mode 100644 new mode 100755 diff --git a/yajl/ChangeLog b/yajl/ChangeLog old mode 100644 new mode 100755 diff --git a/yajl/Jamfile b/yajl/Jamfile old mode 100644 new mode 100755 diff --git a/yajl/README b/yajl/README old mode 100644 new mode 100755 diff --git a/yajl/TODO b/yajl/TODO old mode 100644 new mode 100755 diff --git a/yajl/afiles b/yajl/afiles old mode 100644 new mode 100755 diff --git a/yajl/json_verify.c b/yajl/json_verify.c old mode 100644 new mode 100755 diff --git a/yajl/yajl.c b/yajl/yajl.c old mode 100644 new mode 100755 diff --git a/yajl/yajl.h b/yajl/yajl.h old mode 100644 new mode 100755 diff --git a/yajl/yajl_alloc.c b/yajl/yajl_alloc.c old mode 100644 new mode 100755 diff --git a/yajl/yajl_alloc.h b/yajl/yajl_alloc.h old mode 100644 new mode 100755 diff --git a/yajl/yajl_buf.c b/yajl/yajl_buf.c old mode 100644 new mode 100755 diff --git a/yajl/yajl_buf.h b/yajl/yajl_buf.h old mode 100644 new mode 100755 diff --git a/yajl/yajl_bytestack.h b/yajl/yajl_bytestack.h old mode 100644 new mode 100755 diff --git a/yajl/yajl_common.h b/yajl/yajl_common.h old mode 100644 new mode 100755 diff --git a/yajl/yajl_encode.c b/yajl/yajl_encode.c old mode 100644 new mode 100755 diff --git a/yajl/yajl_encode.h b/yajl/yajl_encode.h old mode 100644 new mode 100755 diff --git a/yajl/yajl_gen.c b/yajl/yajl_gen.c old mode 100644 new mode 100755 index d314907..17ce003 --- a/yajl/yajl_gen.c +++ b/yajl/yajl_gen.c @@ -14,16 +14,16 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "yajl_gen.h" -#include "yajl_buf.h" -#include "yajl_encode.h" - #include #include #include #include #include +#include "yajl_gen.h" +#include "yajl_buf.h" +#include "yajl_encode.h" + typedef enum { yajl_gen_start, yajl_gen_map_start, diff --git a/yajl/yajl_gen.h b/yajl/yajl_gen.h old mode 100644 new mode 100755 diff --git a/yajl/yajl_lex.c b/yajl/yajl_lex.c old mode 100644 new mode 100755 diff --git a/yajl/yajl_lex.h b/yajl/yajl_lex.h old mode 100644 new mode 100755 diff --git a/yajl/yajl_parse.h b/yajl/yajl_parse.h old mode 100644 new mode 100755 diff --git a/yajl/yajl_parser.c b/yajl/yajl_parser.c old mode 100644 new mode 100755 index 20d5693..07ce279 --- a/yajl/yajl_parser.c +++ b/yajl/yajl_parser.c @@ -14,12 +14,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "yajl_parse.h" -#include "yajl_lex.h" -#include "yajl_parser.h" -#include "yajl_encode.h" -#include "yajl_bytestack.h" - #include #include #include @@ -29,6 +23,12 @@ #include #include +#include "yajl_parse.h" +#include "yajl_lex.h" +#include "yajl_parser.h" +#include "yajl_encode.h" +#include "yajl_bytestack.h" + #define MAX_VALUE_TO_MULTIPLY ((LLONG_MAX / 10) + (LLONG_MAX % 10)) /* same semantics as strtol */ diff --git a/yajl/yajl_parser.h b/yajl/yajl_parser.h old mode 100644 new mode 100755 diff --git a/yajl/yajl_test.c b/yajl/yajl_test.c old mode 100644 new mode 100755 diff --git a/yajl/yajl_test.exe b/yajl/yajl_test.exe deleted file mode 100644 index abb59cb..0000000 Binary files a/yajl/yajl_test.exe and /dev/null differ diff --git a/yajl/yajl_test.obj b/yajl/yajl_test.obj deleted file mode 100644 index c26d088..0000000 Binary files a/yajl/yajl_test.obj and /dev/null differ diff --git a/yajl/yajl_tree.c b/yajl/yajl_tree.c old mode 100644 new mode 100755 diff --git a/yajl/yajl_tree.h b/yajl/yajl_tree.h old mode 100644 new mode 100755 index dc26183..d5cc286 --- a/yajl/yajl_tree.h +++ b/yajl/yajl_tree.h @@ -165,6 +165,9 @@ yajl_val yajl_tree_get_first(yajl_val n, const char *key, yajl_type type); * or NULL if the value is not a string. */ #define YAJL_GET_STRING(v) (YAJL_IS_STRING(v) ? (v)->u.string : NULL) +/* Same as above but return an allocated string or NULL */ +#define YAJL_GET_STRINGDUP(v) (YAJL_IS_STRING(v) ? strdup((v)->u.string) : NULL) + /** Get the string representation of a number. You should check type first, * perhaps using YAJL_IS_NUMBER */ #define YAJL_GET_NUMBER(v) ((v)->u.number.r) diff --git a/yajl/yajl_version.c b/yajl/yajl_version.c old mode 100644 new mode 100755 diff --git a/yajl/yajl_version.h b/yajl/yajl_version.h old mode 100644 new mode 100755 -- cgit v1.2.3