comparison src/json.c @ 7868:17e6ff1a74f1 v7.4.1231

commit https://github.com/vim/vim/commit/19d2f1589850d7db1ce77efec052929246f156e2 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Feb 1 21:38:19 2016 +0100 patch 7.4.1231 Problem: JSON messages are not parsed properly. Solution: Queue received messages.
author Christian Brabandt <cb@256bit.org>
date Mon, 01 Feb 2016 21:45:06 +0100
parents 6b0891de44a9
children 98a96e0ca73b
comparison
equal deleted inserted replaced
7867:3b79ecd05a51 7868:17e6ff1a74f1
547 res->vval.v_number = VVAL_NONE; 547 res->vval.v_number = VVAL_NONE;
548 } 548 }
549 549
550 /* 550 /*
551 * Decode the JSON from "reader" and store the result in "res". 551 * Decode the JSON from "reader" and store the result in "res".
552 */ 552 * Return OK or FAIL;
553 void 553 */
554 int
554 json_decode(js_read_T *reader, typval_T *res) 555 json_decode(js_read_T *reader, typval_T *res)
555 { 556 {
556 json_skip_white(reader); 557 json_skip_white(reader);
557 json_decode_item(reader, res); 558 json_decode_item(reader, res);
558 json_skip_white(reader); 559 json_skip_white(reader);
559 if (reader->js_buf[reader->js_used] != NUL) 560 if (reader->js_buf[reader->js_used] != NUL)
560 EMSG(_(e_invarg)); 561 return FAIL;
562 return OK;
561 } 563 }
562 #endif 564 #endif