diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2016-04-14 11:55:10 -0700 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2016-04-14 11:55:10 -0700 |
commit | 534b5c98baf02b2101d25917d46a1605906a6c53 (patch) | |
tree | 62c1296e4ada96dcf3e8f3091727fc92ed704555 /upb/json/printer.c | |
parent | 458077ccb4f7eddc94549528c3a9809745982352 (diff) | |
parent | 1019f76fc550bebafed0cfb65e6a04b9ff945185 (diff) |
Merge pull request #55 from haberman/jsonflag
Added migration flag for users using old JSON format.
Diffstat (limited to 'upb/json/printer.c')
-rw-r--r-- | upb/json/printer.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/upb/json/printer.c b/upb/json/printer.c index c290efe..e6135bb 100644 --- a/upb/json/printer.c +++ b/upb/json/printer.c @@ -47,12 +47,19 @@ void freestrpc(void *ptr) { strpc *newstrpc(upb_handlers *h, const upb_fielddef *f) { /* TODO(haberman): handle malloc failure. */ strpc *ret = malloc(sizeof(*ret)); - size_t len; - ret->len = upb_fielddef_getjsonname(f, NULL, 0); - ret->ptr = malloc(ret->len); - len = upb_fielddef_getjsonname(f, ret->ptr, ret->len); - UPB_ASSERT_VAR(len, len == ret->len); - ret->len--; /* NULL */ + if (getenv("UPB_JSON_WRITE_LEGACY_FIELD_NAMES")) { + /* Temporary code to help people migrate if they were depending on the + * old, non-proto3-json-compliant field names. */ + ret->ptr = upb_strdup(upb_fielddef_name(f)); + ret->len = strlen(ret->ptr); + } else { + size_t len; + ret->len = upb_fielddef_getjsonname(f, NULL, 0); + ret->ptr = malloc(ret->len); + len = upb_fielddef_getjsonname(f, ret->ptr, ret->len); + UPB_ASSERT_VAR(len, len == ret->len); + ret->len--; /* NULL */ + } upb_handlers_addcleanup(h, ret, freestrpc); return ret; |