aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2019-02-05 17:02:49 +0100
committerMicael Karlberg <[email protected]>2019-02-22 19:45:51 +0100
commita217c7185727cd69da5f780ac63b68b46bc1d9b4 (patch)
tree086baf04ab855e92a0fee727e1579685dce1e23a
parent31dd6cbfc080a205e146027c183e42fd68f40d4b (diff)
downloadotp-a217c7185727cd69da5f780ac63b68b46bc1d9b4.tar.gz
otp-a217c7185727cd69da5f780ac63b68b46bc1d9b4.tar.bz2
otp-a217c7185727cd69da5f780ac63b68b46bc1d9b4.zip
[socket-nif] Rename 'nosup' -> 'notsup'
as called in crypto.erl and erlang.erl.
-rw-r--r--erts/emulator/Makefile.in2
-rw-r--r--erts/emulator/nifs/common/net_nif.c16
-rw-r--r--erts/emulator/nifs/common/socket_nif.c44
-rw-r--r--erts/preloaded/src/socket.erl28
4 files changed, 45 insertions, 45 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 64e4f2f4e4..3e9cfc990a 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -839,7 +839,7 @@ EMU_OBJS = \
ifneq ($(TARGET), win32)
# These are *currently* only needed for non-win32,
# since the nif-functions for socket and net are basically
-# stubbed with nosup in the win32 case.
+# stubbed with notsup in the win32 case.
ESOCK_RUN_OBJS = \
$(OBJDIR)/socket_dbg.o \
$(OBJDIR)/socket_tarray.o \
diff --git a/erts/emulator/nifs/common/net_nif.c b/erts/emulator/nifs/common/net_nif.c
index d48112133f..fba9ee54fc 100644
--- a/erts/emulator/nifs/common/net_nif.c
+++ b/erts/emulator/nifs/common/net_nif.c
@@ -462,7 +462,7 @@ ERL_NIF_TERM nif_info(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
ERL_NIF_TERM info, tmp;
@@ -498,7 +498,7 @@ ERL_NIF_TERM nif_command(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
ERL_NIF_TERM ecmd, result;
@@ -569,7 +569,7 @@ ERL_NIF_TERM nif_gethostname(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
ERL_NIF_TERM result;
@@ -645,7 +645,7 @@ ERL_NIF_TERM nif_getnameinfo(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
ERL_NIF_TERM result;
ERL_NIF_TERM eSockAddr, eFlags;
@@ -795,7 +795,7 @@ ERL_NIF_TERM nif_getaddrinfo(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
ERL_NIF_TERM result, eHostName, eServName; //, eHints;
char* hostName;
@@ -977,7 +977,7 @@ ERL_NIF_TERM nif_if_name2index(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
ERL_NIF_TERM eifn, result;
char ifn[IF_NAMESIZE+1];
@@ -1049,7 +1049,7 @@ ERL_NIF_TERM nif_if_index2name(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
ERL_NIF_TERM result;
unsigned int idx;
@@ -1114,7 +1114,7 @@ ERL_NIF_TERM nif_if_names(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
ERL_NIF_TERM result;
diff --git a/erts/emulator/nifs/common/socket_nif.c b/erts/emulator/nifs/common/socket_nif.c
index 4b8d65ce6a..843fe2440f 100644
--- a/erts/emulator/nifs/common/socket_nif.c
+++ b/erts/emulator/nifs/common/socket_nif.c
@@ -2802,7 +2802,7 @@ ERL_NIF_TERM nif_info(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
if (argc != 0) {
return enif_make_badarg(env);
@@ -2867,7 +2867,7 @@ ERL_NIF_TERM nif_supports(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
int key;
@@ -4157,7 +4157,7 @@ ERL_NIF_TERM nif_open(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
int edomain, etype, eproto;
int domain, type, proto;
@@ -4451,7 +4451,7 @@ ERL_NIF_TERM nif_bind(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
ERL_NIF_TERM eSockAddr;
@@ -4551,7 +4551,7 @@ ERL_NIF_TERM nif_connect(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
ERL_NIF_TERM eSockAddr;
@@ -4666,7 +4666,7 @@ ERL_NIF_TERM nif_finalize_connection(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
@@ -4781,7 +4781,7 @@ ERL_NIF_TERM nif_listen(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
int backlog;
@@ -4851,7 +4851,7 @@ ERL_NIF_TERM nif_accept(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
ERL_NIF_TERM ref;
@@ -5235,7 +5235,7 @@ ERL_NIF_TERM nif_send(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
ERL_NIF_TERM sockRef, sendRef;
@@ -5363,7 +5363,7 @@ ERL_NIF_TERM nif_sendto(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
ERL_NIF_TERM sockRef, sendRef;
@@ -5499,7 +5499,7 @@ ERL_NIF_TERM nif_sendmsg(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
ERL_NIF_TERM res, sockRef, sendRef, eMsgHdr;
SocketDescriptor* descP;
@@ -5799,7 +5799,7 @@ ERL_NIF_TERM nif_recv(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
ERL_NIF_TERM sockRef, recvRef;
@@ -5943,7 +5943,7 @@ ERL_NIF_TERM nif_recvfrom(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
ERL_NIF_TERM sockRef, recvRef;
@@ -6112,7 +6112,7 @@ ERL_NIF_TERM nif_recvmsg(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
ERL_NIF_TERM sockRef, recvRef;
@@ -6295,7 +6295,7 @@ ERL_NIF_TERM nif_close(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
@@ -6452,7 +6452,7 @@ ERL_NIF_TERM nif_finalize_close(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
@@ -6536,7 +6536,7 @@ ERL_NIF_TERM nif_shutdown(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
unsigned int ehow;
@@ -6617,7 +6617,7 @@ ERL_NIF_TERM nif_setopt(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP = NULL;
int eLevel, level = -1;
@@ -10052,7 +10052,7 @@ ERL_NIF_TERM nif_getopt(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
int eLevel, level = -1;
@@ -12771,7 +12771,7 @@ ERL_NIF_TERM nif_sockname(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
ERL_NIF_TERM res;
@@ -12845,7 +12845,7 @@ ERL_NIF_TERM nif_peername(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
ERL_NIF_TERM res;
@@ -12920,7 +12920,7 @@ ERL_NIF_TERM nif_cancel(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
#if defined(__WIN32__)
- return enif_raise_exception(env, MKA(env, "nosup"));
+ return enif_raise_exception(env, MKA(env, "notsup"));
#else
SocketDescriptor* descP;
ERL_NIF_TERM op, opRef, result;
diff --git a/erts/preloaded/src/socket.erl b/erts/preloaded/src/socket.erl
index 287ef1d791..79459941cf 100644
--- a/erts/preloaded/src/socket.erl
+++ b/erts/preloaded/src/socket.erl
@@ -1056,8 +1056,8 @@ open(Domain, Type, Protocol0, Extra) when is_map(Extra) ->
throw:T ->
T;
%% <WIN32-TEMPORARY>
- error:nosup:S ->
- erlang:raise(error, nosup, S);
+ error:notsup:S ->
+ erlang:raise(error, notsup, S);
%% </WIN32-TEMPORARY>
error:Reason ->
{error, Reason}
@@ -1093,8 +1093,8 @@ bind(#socket{ref = SockRef}, Addr)
nif_bind(SockRef, ?SOCKADDR_IN6_DEFAULT(Addr))
catch
%% <WIN32-TEMPORARY>
- error:nosup:S ->
- erlang:raise(error, nosup, S);
+ error:notsup:S ->
+ erlang:raise(error, notsup, S);
%% </WIN32-TEMPORARY>
throw:ERROR ->
ERROR
@@ -1106,8 +1106,8 @@ bind(#socket{ref = SockRef} = _Socket, Addr) when is_map(Addr) ->
end
catch
%% <WIN32-TEMPORARY>
- error:nosup:S ->
- erlang:raise(error, nosup, S);
+ error:notsup:S ->
+ erlang:raise(error, notsup, S);
%% </WIN32-TEMPORARY>
throw:ERROR ->
ERROR
@@ -1144,8 +1144,8 @@ bind(#socket{ref = SockRef}, Addrs, Action)
end
catch
%% <WIN32-TEMPORARY>
- error:nosup:S ->
- erlang:raise(error, nosup, S);
+ error:notsup:S ->
+ erlang:raise(error, notsup, S);
%% </WIN32-TEMPORARY>
throw:ERROR ->
ERROR
@@ -2152,8 +2152,8 @@ shutdown(#socket{ref = SockRef}, How) ->
throw:T ->
T;
%% <WIN32-TEMPORARY>
- error:nosup:S ->
- erlang:raise(error, nosup, S);
+ error:notsup:S ->
+ erlang:raise(error, notsup, S);
%% </WIN32-TEMPORARY>
error:Reason ->
{error, Reason}
@@ -2228,8 +2228,8 @@ setopt(#socket{ref = SockRef}, Level, Key, Value) ->
throw:T ->
T;
%% <WIN32-TEMPORARY>
- error:nosup:S ->
- erlang:raise(error, nosup, S);
+ error:notsup:S ->
+ erlang:raise(error, notsup, S);
%% </WIN32-TEMPORARY>
error:Reason ->
{error, Reason} % Process more?
@@ -2314,8 +2314,8 @@ getopt(#socket{ref = SockRef}, Level, Key) ->
throw:E:_S ->
E;
%% <WIN32-TEMPORARY>
- error:nosup:S ->
- erlang:raise(error, nosup, S);
+ error:notsup:S ->
+ erlang:raise(error, notsup, S);
%% </WIN32-TEMPORARY>
error:Reason:_Stack ->
{error, Reason} % Process more?