diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2016-04-28 14:43:08 -0700 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2016-04-28 14:43:08 -0700 |
commit | 12fdeb9b41cb5ce2a13a6f10f0626d6e67e9f237 (patch) | |
tree | 82b9820ae26decd6ac41bd8a06185d978980ee3c /ruby/ext/google/protobuf_c/encode_decode.c | |
parent | cf14183bcd5485b4a71541599ddce0b35eb71352 (diff) | |
parent | b53417c7356deab70f44b60bd7e6270023ddc3b6 (diff) | |
download | protobuf-12fdeb9b41cb5ce2a13a6f10f0626d6e67e9f237.tar.gz protobuf-12fdeb9b41cb5ce2a13a6f10f0626d6e67e9f237.tar.bz2 protobuf-12fdeb9b41cb5ce2a13a6f10f0626d6e67e9f237.zip |
Merge branch 'master' of github.com:google/protobuf
Diffstat (limited to 'ruby/ext/google/protobuf_c/encode_decode.c')
-rw-r--r-- | ruby/ext/google/protobuf_c/encode_decode.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ruby/ext/google/protobuf_c/encode_decode.c b/ruby/ext/google/protobuf_c/encode_decode.c index 9bc7273e..f6bea50f 100644 --- a/ruby/ext/google/protobuf_c/encode_decode.c +++ b/ruby/ext/google/protobuf_c/encode_decode.c @@ -656,7 +656,6 @@ static const upb_json_parsermethod *msgdef_jsonparsermethod(Descriptor* desc) { #define STACK_ENV_STACKBYTES 4096 typedef struct { upb_env env; - upb_seededalloc alloc; const char* ruby_error_template; char allocbuf[STACK_ENV_STACKBYTES]; } stackenv; @@ -681,16 +680,12 @@ static bool env_error_func(void* ud, const upb_status* status) { static void stackenv_init(stackenv* se, const char* errmsg) { se->ruby_error_template = errmsg; - upb_env_init(&se->env); - upb_seededalloc_init(&se->alloc, &se->allocbuf, STACK_ENV_STACKBYTES); - upb_env_setallocfunc( - &se->env, upb_seededalloc_getallocfunc(&se->alloc), &se->alloc); + upb_env_init2(&se->env, se->allocbuf, sizeof(se->allocbuf), NULL); upb_env_seterrorfunc(&se->env, env_error_func, se); } static void stackenv_uninit(stackenv* se) { upb_env_uninit(&se->env); - upb_seededalloc_uninit(&se->alloc); } /* |