Remove error.c

This commit is contained in:
ruti 2024-02-19 12:51:34 +03:00
parent 212d9c4b2d
commit 90d2a3e4f3
3 changed files with 42 additions and 51 deletions

View File

@ -1,7 +1,7 @@
TARGET = ciadpi TARGET = ciadpi
CC ?= gcc CC ?= gcc
CFLAGS += -std=c99 -O2 -D_XOPEN_SOURCE=500 CFLAGS += -std=c99 -O2 -D_XOPEN_SOURCE=500
SOURCES = packets.c main.c conev.c proxy.c desync.c error.c SOURCES = packets.c main.c conev.c proxy.c desync.c
all: all:
$(CC) $(CFLAGS) $(SOURCES) -I . -o $(TARGET) $(CC) $(CFLAGS) $(SOURCES) -I . -o $(TARGET)

46
error.c
View File

@ -1,46 +0,0 @@
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#ifdef _WIN32
#include <winsock2.h>
#endif
int unie(int e)
{
#ifdef _WIN32
switch (e) {
case WSAEWOULDBLOCK:
return EAGAIN;
case WSAETIMEDOUT:
return ETIMEDOUT;
case WSAENETUNREACH:
return ENETUNREACH;
case WSAEHOSTUNREACH:
return EHOSTUNREACH;
case WSAECONNREFUSED:
return ECONNREFUSED;
}
#endif
return e;
}
int get_e()
{
#ifdef _WIN32
int e = WSAGetLastError();
return unie(e);
#else
return errno;
#endif
}
void uniperror(char *str)
{
#ifdef _WIN32
int e = WSAGetLastError();
fprintf(stderr, "%s: %d\n", str, e);
#else
perror(str);
#endif
}

45
error.h
View File

@ -1,4 +1,41 @@
int unie(int e); #include <stdio.h>
void uniperror(char *str); #include <errno.h>
int get_e();
void uniperror(char *str); #ifdef _WIN32
#include <winsock2.h>
#endif
#ifdef _WIN32
#define get_e() \
unie(WSAGetLastError())
#else
#define get_e() \
errno
#endif
#ifdef _WIN32
#define uniperror(str) \
fprintf(stderr, "%s: %d\n", str, WSAGetLastError())
#else
#define uniperror(str) \
perror(str)
#endif
inline const int unie(int e)
{
#ifdef _WIN32
switch (e) {
case WSAEWOULDBLOCK:
return EAGAIN;
case WSAETIMEDOUT:
return ETIMEDOUT;
case WSAENETUNREACH:
return ENETUNREACH;
case WSAEHOSTUNREACH:
return EHOSTUNREACH;
case WSAECONNREFUSED:
return ECONNREFUSED;
}
#endif
return e;
}