aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2019-02-02 23:15:33 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-02 23:15:33 -0800
commitc2b4029b32c006cdc6678ec1660baffe3c14f35a (patch)
tree915c73cea023105cf9c1958617ed0383f889f8ea
parenta9db1414be5d5e037f5b03ee069ff7752c4b62bc (diff)
parent7513ed6ed6c9662f62fccab1454e31874c2a8ba0 (diff)
downloadjsmn-c2b4029b32c006cdc6678ec1660baffe3c14f35a.tar.gz
Upgrade jsmn to 18e9fe42cbfe21d65076f5c77ae2be379ad1270f am: 983ec7f176 am: be36d7b6d0
am: 7513ed6ed6 Change-Id: Ie0dceae75e773e1cc8fa4a53271fb159dc3b1943
-rw-r--r--.travis.yml4
-rw-r--r--METADATA12
-rw-r--r--jsmn.c2
3 files changed, 11 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..1c8ebd3
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,4 @@
+language: c
+sudo: false
+script:
+ - make test
diff --git a/METADATA b/METADATA
index f404bfc..650d696 100644
--- a/METADATA
+++ b/METADATA
@@ -1,5 +1,5 @@
name: "jsmn"
-description: "jsmn (pronounced like 'jasmine') is a minimalistic JSON parser in C."
+description: "jsmn (pronounced like \'jasmine\') is a minimalistic JSON parser in C."
third_party {
url {
type: HOMEPAGE
@@ -7,12 +7,12 @@ third_party {
}
url {
type: ARCHIVE
- value: "https://github.com/zserge/jsmn/archive/732d283ee9a2e5c34c52af0e044850576888ab09.zip"
+ value: "https://github.com/zserge/jsmn/archive/18e9fe42cbfe21d65076f5c77ae2be379ad1270f.zip"
}
- version: "732d283ee9a2e5c34c52af0e044850576888ab09"
+ version: "18e9fe42cbfe21d65076f5c77ae2be379ad1270f"
last_upgrade_date {
- year: 2018
- month: 9
- day: 6
+ year: 2019
+ month: 2
+ day: 1
}
}
diff --git a/jsmn.c b/jsmn.c
index bcd6392..853c3f1 100644
--- a/jsmn.c
+++ b/jsmn.c
@@ -1,7 +1,7 @@
#include "jsmn.h"
/**
- * Allocates a fresh unused token from the token pull.
+ * Allocates a fresh unused token from the token pool.
*/
static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser,
jsmntok_t *tokens, size_t num_tokens) {