Adjust for OTP23 (#6)

* Adjust to OTP23, including changes from @Licenser and @egobrain

* Update Makefile based on the newest rebar3 template for that

* Update version in app.src

* Don't inline functions in CFLAGS

* Revert dirty schedulers change

Author: Brujo Benavides

c_src/Makefile

@@ -5,9 +5,9 @@ BASEDIR := $(abspath $(CURDIR)/..)
 
 PROJECT ?= zstd_nif
 
-ERTS_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s/erts-~s/include/\", [code:root_dir(), erlang:system_info(version)]).")
-ERL_INTERFACE_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, include)]).")
-ERL_INTERFACE_LIB_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, lib)]).")
+ERTS_INCLUDE_DIR ?= $(shell erl -noshell -eval "io:format(\"~ts/erts-~ts/include/\", [code:root_dir(), erlang:system_info(version)])." -s init stop)
+ERL_INTERFACE_INCLUDE_DIR ?= $(shell erl -noshell -eval "io:format(\"~ts\", [code:lib_dir(erl_interface, include)])." -s init stop)
+ERL_INTERFACE_LIB_DIR ?= $(shell erl -noshell -eval "io:format(\"~ts\", [code:lib_dir(erl_interface, lib)])." -s init stop)
 
 C_SRC_DIR = $(CURDIR)
 C_SRC_OUTPUT ?= $(CURDIR)/../priv/$(PROJECT).so
@@ -33,7 +33,7 @@ endif
 CFLAGS += -fPIC -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR) -I ../priv/zstd/lib
 CXXFLAGS += -fPIC -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR)
 
-LDLIBS += -L $(ERL_INTERFACE_LIB_DIR) -lerl_interface -lei
+LDLIBS += -L $(ERL_INTERFACE_LIB_DIR) -lei
 LDFLAGS += -shared $(CURDIR)/../priv/zstd/lib/libzstd.a
 
 # Verbosity.

c_src/zstd_nif.c

@@ -13,7 +13,7 @@ static ERL_NIF_TERM zstd_nif_compress(ErlNifEnv* env, int argc, const ERL_NIF_TE
 
   ZSTD_CCtx* ctx = (ZSTD_CCtx*)enif_tsd_get(zstdCompressContextKey);
   if (!ctx) {
-      ctx = ZSTD_createCCtx(); 
+      ctx = ZSTD_createCCtx();
       enif_tsd_set(zstdCompressContextKey, ctx);
   }
 
@@ -26,7 +26,7 @@ static ERL_NIF_TERM zstd_nif_compress(ErlNifEnv* env, int argc, const ERL_NIF_TE
 
   if(!enif_alloc_binary(buff_size, &ret_bin))
     return enif_make_atom(env, "error");
-  
+
   compressed_size = ZSTD_compressCCtx(ctx, ret_bin.data, buff_size, bin.data, bin.size, compression_level);
   if(ZSTD_isError(compressed_size))
     return enif_make_atom(env, "error");
@@ -45,7 +45,7 @@ static ERL_NIF_TERM zstd_nif_decompress(ErlNifEnv* env, int argc, const ERL_NIF_
 
   ZSTD_DCtx* ctx = (ZSTD_DCtx*)enif_tsd_get(zstdDecompressContextKey);
   if (!ctx) {
-      ctx = ZSTD_createDCtx(); 
+      ctx = ZSTD_createDCtx();
       enif_tsd_set(zstdDecompressContextKey, ctx);
   }
 
@@ -55,7 +55,7 @@ static ERL_NIF_TERM zstd_nif_decompress(ErlNifEnv* env, int argc, const ERL_NIF_
   uncompressed_size = ZSTD_getDecompressedSize(bin.data, bin.size);
 
   outp = enif_make_new_binary(env, uncompressed_size, &out);
-  
+
   if(ZSTD_decompressDCtx(ctx, outp, uncompressed_size, bin.data, bin.size) != uncompressed_size)
     return enif_make_atom(env, "error");
 

rebar.config

@@ -46,4 +46,4 @@
 {alias, [{test, [format, lint, hank, xref, dialyzer, eunit]}]}.
 
 {project_plugins,
- [{rebar3_format, "~> 1.0.0"}, {rebar3_lint, "~> 0.4.0"}, {rebar3_hank, "~> 0.4.0"}]}.
+ [{rebar3_format, "~> 1.0.0"}, {rebar3_lint, "~> 0.4.0"}, {rebar3_hank, "~> 1.1.1"}]}.

src/zstd.app.src

@@ -1,7 +1,7 @@
 {application,
  zstd,
  [{description, "Zstd binding for Erlang/Elixir"},
-  {vsn, "0.2.0"},
+  {vsn, "0.3.0"},
   {registered, []},
   {applications, [kernel, stdlib]},
   {env, []},

src/zstd.erl

@@ -17,7 +17,7 @@ compress(Binary) ->
 compress(_, _) ->
     erlang:nif_error(?LINE).
 
--spec decompress(Compressed :: binary()) -> Uncompressed :: binary().
+-spec decompress(Compressed :: binary()) -> Uncompressed :: binary() | error.
 decompress(_) ->
     erlang:nif_error(?LINE).