diff options
| author | Nick Vatamaniuc <vatamane@gmail.com> | 2021-11-24 12:22:16 -0500 |
|---|---|---|
| committer | Nick Vatamaniuc <vatamane@gmail.com> | 2021-11-24 12:26:13 -0500 |
| commit | 6817f40867d9596924ec64b3d39612406787172a (patch) | |
| tree | 7bfb043bda7aa697f8bebe929e060d6a302a792b | |
| parent | ff76c51c3350ed33d7cc81b0901ae87f76f05cf7 (diff) | |
| download | couchdb-cleanup-couch-ejson-compare.tar.gz | |
Cleanup couch_ejson_compare C modulecleanup-couch-ejson-compare
Add `static` modifiers to some of the newer functions.
Fix function protype for get_collator to be `void`. This squashes this warning
on MS compiler:
```
'get_collator': no function prototype given: converting '()' to '(void)'
```
| -rw-r--r-- | src/couch/priv/couch_ejson_compare/couch_ejson_compare.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/couch/priv/couch_ejson_compare/couch_ejson_compare.c b/src/couch/priv/couch_ejson_compare/couch_ejson_compare.c index 6e200320d..49a3a5396 100644 --- a/src/couch/priv/couch_ejson_compare/couch_ejson_compare.c +++ b/src/couch/priv/couch_ejson_compare/couch_ejson_compare.c @@ -62,6 +62,9 @@ static int64_t loadEpoch = 0; static ErlNifMutex* collMutex = NULL; static ERL_NIF_TERM less_json_nif(ErlNifEnv*, int, const ERL_NIF_TERM []); +static ERL_NIF_TERM compare_strings_nif(ErlNifEnv*, int, const ERL_NIF_TERM []); +static ERL_NIF_TERM get_icu_version(ErlNifEnv*, int, const ERL_NIF_TERM []); +static ERL_NIF_TERM get_uca_version(ErlNifEnv*, int, const ERL_NIF_TERM []); static int on_load(ErlNifEnv*, void**, ERL_NIF_TERM); static void on_unload(ErlNifEnv*, void*); static __inline int less_json(int, ctx_t*, ERL_NIF_TERM, ERL_NIF_TERM); @@ -69,7 +72,8 @@ static __inline int atom_sort_order(ErlNifEnv*, ERL_NIF_TERM); static __inline int compare_strings(ctx_t*, ErlNifBinary, ErlNifBinary); static __inline int compare_lists(int, ctx_t*, ERL_NIF_TERM, ERL_NIF_TERM); static __inline int compare_props(int, ctx_t*, ERL_NIF_TERM, ERL_NIF_TERM); -static __inline UCollator* get_collator(); +static __inline int is_max_utf8_marker(ErlNifBinary); +static __inline UCollator* get_collator(void); /* Should match the <<255,255,255,255>> in: * - src/mango/src/mango_idx_view.hrl#L13 @@ -78,7 +82,7 @@ static const unsigned char max_utf8_marker[] = {255, 255, 255, 255}; UCollator* -get_collator() +get_collator(void) { UErrorCode status = U_ZERO_ERROR; |