diff options
| author | Kevron Rees <tripzero.kev@gmail.com> | 2013-03-16 12:24:55 -0700 |
|---|---|---|
| committer | Kevron Rees <tripzero.kev@gmail.com> | 2013-03-16 12:24:55 -0700 |
| commit | febc838aa3668e9f7a6090e8428850983ac08e12 (patch) | |
| tree | e55c0caa8e5241a2b0725896be3843be32062baf | |
| parent | 18cf20544e0537d86081708f655ef9e642c92bec (diff) | |
| download | automotive-message-broker-febc838aa3668e9f7a6090e8428850983ac08e12.tar.gz | |
fixed merge
| -rw-r--r-- | plugins/websocketsourceplugin/websocketsource.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/websocketsourceplugin/websocketsource.cpp b/plugins/websocketsourceplugin/websocketsource.cpp index 38f2d78e..38e18875 100644 --- a/plugins/websocketsourceplugin/websocketsource.cpp +++ b/plugins/websocketsourceplugin/websocketsource.cpp @@ -235,6 +235,9 @@ static int callback_http_only(libwebsocket_context *context,struct libwebsocket DebugOut(2)<<"websocket source pre-json parse time: "<<prejsonparsetime<<endl; + json_object *rootobject; + json_tokener *tokener = json_tokener_new(); + enum json_tokener_error err; do { rootobject = json_tokener_parse_ex(tokener, (char*)in,len); |