aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-12-18 14:44:47 +0100
committerSverker Eriksson <[email protected]>2018-12-18 14:44:47 +0100
commitea262e24e4b9d019cf253aa9a8fbcd907c2d91eb (patch)
treecc68c87941f2491b78218d9bd596f5c5c4addfd3 /erts/emulator
parent70e2bff30c8f522a7f614ff384e8cd9e08184b9c (diff)
parentdf0638e021eb18a4271a02fdae08aa1779867209 (diff)
downloadotp-ea262e24e4b9d019cf253aa9a8fbcd907c2d91eb.tar.gz
otp-ea262e24e4b9d019cf253aa9a8fbcd907c2d91eb.tar.bz2
otp-ea262e24e4b9d019cf253aa9a8fbcd907c2d91eb.zip
Merge branch 'sverker/erts/prim_file-perm-own-bigendian/OTP-15485' into maint
* sverker/erts/prim_file-perm-own-bigendian/OTP-15485: erts: Fix warning and potential big-endian-bug in prim_file
Diffstat (limited to 'erts/emulator')
-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)) {