diff --git a/CgeNet.h b/CgeNet.h index 3a2543f..69d310c 100644 --- a/CgeNet.h +++ b/CgeNet.h @@ -8,7 +8,7 @@ enum CgeNetCode { CGE_NET_EOK, CGE_NET_EUNKNOWN, CGE_NET_EINVAL, - CGE_NET_ENOMEM, + CGE_NET_EOOM, CGE_NET_EADDRINUSE, CGE_NET_EADDRNOTAVAIL, CGE_NET_ECONNREFUSED, diff --git a/posix/Poll.c b/posix/Poll.c index b9b43ef..f099853 100644 --- a/posix/Poll.c +++ b/posix/Poll.c @@ -14,7 +14,7 @@ static int errnoToErrorCode(int value) { return CGE_NET_EINVAL; case ENOMEM: - return CGE_NET_ENOMEM; + return CGE_NET_EOOM; case EWOULDBLOCK: return CGE_NET_EWOULDBLOCK; @@ -29,7 +29,7 @@ CgeNetPoll *CgeNetPollCreate(int *result) { if (!(poll = malloc(sizeof(CgeNetPoll)))) { if (result) - *result = CGE_NET_ENOMEM; + *result = CGE_NET_EOOM; return NULL; } @@ -41,7 +41,7 @@ CgeNetPoll *CgeNetPollCreate(int *result) { free(poll); if (result) - *result = CGE_NET_ENOMEM; + *result = CGE_NET_EOOM; return NULL; } @@ -86,7 +86,7 @@ static int ensureCapacity(CgeNetPoll *poll) { if (!newData || !newPfd) { free(newData); free(newPfd); - poll->lastError = CGE_NET_ENOMEM; + poll->lastError = CGE_NET_EOOM; return 0; } else { memcpy(newData, poll->data, poll->size * sizeof(struct PollData)); diff --git a/posix/Socket.c b/posix/Socket.c index d19680b..9b66adb 100644 --- a/posix/Socket.c +++ b/posix/Socket.c @@ -28,7 +28,7 @@ static int errnoToErrorCode(int value) { return CGE_NET_EINVAL; case ENOMEM: - return CGE_NET_ENOMEM; + return CGE_NET_EOOM; case ETIMEDOUT: return CGE_NET_ETIMEDOUT; @@ -88,7 +88,7 @@ static int socketInit(CgeNetSocket *s, int domain, int type) { CgeNetSocket *CgeNetOpen(int domain, int type, int *result) { CgeNetSocket *socket; - int code = CGE_NET_ENOMEM; + int code = CGE_NET_EOOM; if ((socket = malloc(sizeof(*socket)))) { if ((code = socketInit(socket, domain, type))) { @@ -220,7 +220,7 @@ CgeNetSocket *CgeNetAccept(CgeNetSocket *socket, CgeNetAddr *addr) { if (!(client = malloc(sizeof(*client)))) { close(fd); - socket->lastError = CGE_NET_ENOMEM; + socket->lastError = CGE_NET_EOOM; return NULL; } diff --git a/win32/Poll.c b/win32/Poll.c index 851877c..d666198 100644 --- a/win32/Poll.c +++ b/win32/Poll.c @@ -15,7 +15,7 @@ static int wsaToErrorCode(int value) { case WSAENOBUFS: case WSA_NOT_ENOUGH_MEMORY: - return CGE_NET_ENOMEM; + return CGE_NET_EOOM; case WSAEWOULDBLOCK: return CGE_NET_EWOULDBLOCK; @@ -30,7 +30,7 @@ CgeNetPoll *CgeNetPollCreate(int *result) { if (!(poll = malloc(sizeof(CgeNetPoll)))) { if (result) - *result = CGE_NET_ENOMEM; + *result = CGE_NET_EOOM; return NULL; } @@ -42,7 +42,7 @@ CgeNetPoll *CgeNetPollCreate(int *result) { free(poll); if (result) - *result = CGE_NET_ENOMEM; + *result = CGE_NET_EOOM; return NULL; } @@ -87,7 +87,7 @@ static int ensureCapacity(CgeNetPoll *poll) { if (!newData || !newPfd) { free(newData); free(newPfd); - poll->lastError = CGE_NET_ENOMEM; + poll->lastError = CGE_NET_EOOM; return 0; } else { memcpy(newData, poll->data, poll->size * sizeof(struct PollData)); diff --git a/win32/Socket.c b/win32/Socket.c index 825a0fd..228073d 100644 --- a/win32/Socket.c +++ b/win32/Socket.c @@ -28,7 +28,7 @@ static int wsaToErrorCode(int value) { case WSAENOBUFS: case WSA_NOT_ENOUGH_MEMORY: - return CGE_NET_ENOMEM; + return CGE_NET_EOOM; case WSAEADDRINUSE: return CGE_NET_EADDRINUSE; @@ -87,7 +87,7 @@ static int socketInit(CgeNetSocket *s, int domain, int type) { CgeNetSocket *CgeNetOpen(int domain, int type, int *result) { CgeNetSocket *socket = NULL; - int code = CGE_NET_ENOMEM; + int code = CGE_NET_EOOM; if ((socket = malloc(sizeof(*socket)))) { if ((code = socketInit(socket, domain, type))) { @@ -213,7 +213,7 @@ CgeNetSocket *CgeNetAccept(CgeNetSocket *socket, CgeNetAddr *addr) { if (!(client = malloc(sizeof(*client)))) { closesocket(fd); - socket->lastError = CGE_NET_ENOMEM; + socket->lastError = CGE_NET_EOOM; return NULL; }