diff options
| author | Keith Bostic <keith.bostic@mongodb.com> | 2016-06-01 17:24:18 -0400 |
|---|---|---|
| committer | Keith Bostic <keith.bostic@mongodb.com> | 2016-06-01 17:24:18 -0400 |
| commit | 16ecfdbfdb40cef8401d0e1b074c85a599e3c51e (patch) | |
| tree | 6cdc57dd2b037f9f61848ba1eae74c214b406e6a | |
| parent | 4d19d24ce330bc0cea252cfe8141e18a2045ab31 (diff) | |
| download | mongo-16ecfdbfdb40cef8401d0e1b074c85a599e3c51e.tar.gz | |
Revert "WT-2677 Fix JSON output so only printable ASCII is produced. (#2764)"
This reverts commit 4d19d24ce330bc0cea252cfe8141e18a2045ab31.
| -rw-r--r-- | src/cursor/cur_json.c | 2 | ||||
| -rw-r--r-- | src/include/extern.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cursor/cur_json.c b/src/cursor/cur_json.c index 39a5666b8c7..133b7b9ac9b 100644 --- a/src/cursor/cur_json.c +++ b/src/cursor/cur_json.c @@ -314,7 +314,7 @@ __wt_json_close(WT_SESSION_IMPL *session, WT_CURSOR *cursor) * Can be called with null buf for sizing. */ size_t -__wt_json_unpack_char(u_char ch, u_char *buf, size_t bufsz, bool force_unicode) +__wt_json_unpack_char(char ch, u_char *buf, size_t bufsz, bool force_unicode) { char abbrev; diff --git a/src/include/extern.h b/src/include/extern.h index 34751bfde6c..4ca5c8461a0 100644 --- a/src/include/extern.h +++ b/src/include/extern.h @@ -291,7 +291,7 @@ extern int __wt_curjoin_open(WT_SESSION_IMPL *session, const char *uri, WT_CURSO extern int __wt_curjoin_join(WT_SESSION_IMPL *session, WT_CURSOR_JOIN *cjoin, WT_INDEX *idx, WT_CURSOR *ref_cursor, uint8_t flags, uint8_t range, uint64_t count, uint32_t bloom_bit_count, uint32_t bloom_hash_count); extern int __wt_json_alloc_unpack(WT_SESSION_IMPL *session, const void *buffer, size_t size, const char *fmt, WT_CURSOR_JSON *json, bool iskey, va_list ap); extern void __wt_json_close(WT_SESSION_IMPL *session, WT_CURSOR *cursor); -extern size_t __wt_json_unpack_char(u_char ch, u_char *buf, size_t bufsz, bool force_unicode); +extern size_t __wt_json_unpack_char(char ch, u_char *buf, size_t bufsz, bool force_unicode); extern int __wt_json_column_init(WT_CURSOR *cursor, const char *keyformat, const WT_CONFIG_ITEM *idxconf, const WT_CONFIG_ITEM *colconf); extern int __wt_json_token(WT_SESSION *wt_session, const char *src, int *toktype, const char **tokstart, size_t *toklen); extern const char *__wt_json_tokname(int toktype); |