diff options
| author | Lukas Larsson <[email protected]> | 2017-09-11 15:21:12 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-09-11 15:21:12 +0200 |
| commit | 8636dcaf22432712a63b26fffe9b0fb0ff451374 (patch) | |
| tree | 10de7a829de6cc82fe0b9e60cb49db1f6d5fe861 | |
| parent | eee9dc863a4dc806ee48eea07da08bd87ab0bb0c (diff) | |
| parent | 9b085b7f6d7dddcb83924c4fa50e18e8aec3c74d (diff) | |
| download | otp-8636dcaf22432712a63b26fffe9b0fb0ff451374.tar.gz otp-8636dcaf22432712a63b26fffe9b0fb0ff451374.tar.bz2 otp-8636dcaf22432712a63b26fffe9b0fb0ff451374.zip | |
Merge branch 'lukas/erts/fix_warnings' into maint
* lukas/erts/fix_warnings:
Fix some clang warnings
Fix unused-functions warnings
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 6 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_process.h | 1 | ||||
| -rw-r--r-- | erts/emulator/beam/external.c | 4 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 4 |
4 files changed, 13 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 63c838a91d..22d77ccbdc 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -1597,6 +1597,12 @@ erts_proclist_create(Process *p) return proclist_create(p); } +ErtsProcList * +erts_proclist_copy(ErtsProcList *plp) +{ + return proclist_copy(plp); +} + void erts_proclist_destroy(ErtsProcList *plp) { diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 9d7ba27c50..639818c20c 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -1612,6 +1612,7 @@ Uint64 erts_ensure_later_proc_interval(Uint64); Uint64 erts_step_proc_interval(void); ErtsProcList *erts_proclist_create(Process *); +ErtsProcList *erts_proclist_copy(ErtsProcList *); void erts_proclist_destroy(ErtsProcList *); ERTS_GLB_INLINE int erts_proclist_same(ErtsProcList *, Process *); diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c index 1560844521..c0a3838d42 100644 --- a/erts/emulator/beam/external.c +++ b/erts/emulator/beam/external.c @@ -1923,7 +1923,7 @@ static Eterm erts_term_to_binary_int(Process* p, Eterm Term, int level, Uint fla } result_bin = erts_bin_nrml_alloc(size); - result_bin->orig_bytes[0] = VERSION_MAGIC; + result_bin->orig_bytes[0] = (byte)VERSION_MAGIC; /* Next state immediately, no need to export context */ context->state = TTBEncode; context->s.ec.flags = flags; @@ -1981,7 +1981,7 @@ static Eterm erts_term_to_binary_int(Process* p, Eterm Term, int level, Uint fla context->s.cc.result_bin = result_bin; result_bin = erts_bin_nrml_alloc(real_size); - result_bin->orig_bytes[0] = VERSION_MAGIC; + result_bin->orig_bytes[0] = (byte) VERSION_MAGIC; context->s.cc.destination_bin = result_bin; context->s.cc.dest_len = 0; diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index 50d8a35217..c1fa660cf9 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -789,6 +789,8 @@ signalterm_to_signum(Eterm signal) } } +#ifdef ERTS_SMP + static ERTS_INLINE Eterm signum_to_signalterm(int signum) { @@ -810,6 +812,8 @@ signum_to_signalterm(int signum) } } +#endif + #ifndef ERTS_SMP static ERTS_INLINE Uint signum_to_signalstate(int signum) |