aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-12-20 13:26:53 +0100
committerErlang/OTP <[email protected]>2018-12-20 13:26:53 +0100
commit64273c7e90fa079bdb633d60c632f48454eb4e82 (patch)
treed0058fff908a6973bb2183f1a825e42be94963b6
parent3825199794da28d79b21052a2e69e2335921d55e (diff)
parentdf0638e021eb18a4271a02fdae08aa1779867209 (diff)
downloadotp-64273c7e90fa079bdb633d60c632f48454eb4e82.tar.gz
otp-64273c7e90fa079bdb633d60c632f48454eb4e82.tar.bz2
otp-64273c7e90fa079bdb633d60c632f48454eb4e82.zip
Merge branch 'sverker/erts/prim_file-perm-own-bigendian/OTP-15485' into maint-21
* sverker/erts/prim_file-perm-own-bigendian/OTP-15485: erts: Fix warning and potential big-endian-bug in prim_file
-rw-r--r--erts/emulator/nifs/common/prim_file_nif.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/nifs/common/prim_file_nif.c b/erts/emulator/nifs/common/prim_file_nif.c
index b34bf11205..5fff55b467 100644
--- a/erts/emulator/nifs/common/prim_file_nif.c
+++ b/erts/emulator/nifs/common/prim_file_nif.c
@@ -933,7 +933,7 @@ static ERL_NIF_TERM set_permissions_nif(ErlNifEnv *env, int argc, const ERL_NIF_
posix_errno_t posix_errno;
efile_path_t path;
- Uint permissions;
+ unsigned int permissions;
if(argc != 2 || !enif_get_uint(env, argv[1], &permissions)) {
return enif_make_badarg(env);
@@ -952,7 +952,7 @@ static ERL_NIF_TERM set_owner_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM a
posix_errno_t posix_errno;
efile_path_t path;
- Sint uid, gid;
+ int uid, gid;
if(argc != 3 || !enif_get_int(env, argv[1], &uid)
|| !enif_get_int(env, argv[2], &gid)) {