edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-10-18 23:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consistently order I/O functions declarations and definitions

Browse source
This commit is contained in:
Robert Müller 2024-09-15 15:36:57 +02:00
parent b18073a5cd
commit 1021fdf7ae
2 changed files with 92 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

136
src/base/system.cpp
View file

@ -84,58 +84,6 @@
#include <sys/filio.h>
#endif
IOHANDLE io_stdin()
{
return stdin;
}
IOHANDLE io_stdout()
{
return stdout;
}
IOHANDLE io_stderr()
{
return stderr;
}
IOHANDLE io_current_exe()
{
// From https://stackoverflow.com/a/1024937.
#if defined(CONF_FAMILY_WINDOWS)
wchar_t wide_path[IO_MAX_PATH_LENGTH];
if(GetModuleFileNameW(NULL, wide_path, std::size(wide_path)) == 0 || GetLastError() != ERROR_SUCCESS)
{
return 0;
}
const std::optional<std::string> path = windows_wide_to_utf8(wide_path);
return path.has_value() ? io_open(path.value().c_str(), IOFLAG_READ) : 0;
#elif defined(CONF_PLATFORM_MACOS)
char path[IO_MAX_PATH_LENGTH];
uint32_t path_size = sizeof(path);
if(_NSGetExecutablePath(path, &path_size))
{
return 0;
}
return io_open(path, IOFLAG_READ);
#else
static const char *NAMES[] = {
"/proc/self/exe", // Linux, Android
"/proc/curproc/exe", // NetBSD
"/proc/curproc/file", // DragonFly
};
for(auto &name : NAMES)
{
IOHANDLE result = io_open(name, IOFLAG_READ);
if(result)
{
return result;
}
}
return 0;
#endif
}
static NETSTATS network_stats = {0};
#define VLEN 128
@ -403,11 +351,6 @@ long int io_length(IOHANDLE io)
return length;
}
int io_error(IOHANDLE io)
{
return ferror((FILE *)io);
}
unsigned io_write(IOHANDLE io, const void *buffer, unsigned size)
{
return fwrite(buffer, 1, size, (FILE *)io);
@ -445,6 +388,63 @@ int io_sync(IOHANDLE io)
#endif
}
int io_error(IOHANDLE io)
{
return ferror((FILE *)io);
}
IOHANDLE io_stdin()
{
return stdin;
}
IOHANDLE io_stdout()
{
return stdout;
}
IOHANDLE io_stderr()
{
return stderr;
}
IOHANDLE io_current_exe()
{
// From https://stackoverflow.com/a/1024937.
#if defined(CONF_FAMILY_WINDOWS)
wchar_t wide_path[IO_MAX_PATH_LENGTH];
if(GetModuleFileNameW(NULL, wide_path, std::size(wide_path)) == 0 || GetLastError() != ERROR_SUCCESS)
{
return 0;
}
const std::optional<std::string> path = windows_wide_to_utf8(wide_path);
return path.has_value() ? io_open(path.value().c_str(), IOFLAG_READ) : 0;
#elif defined(CONF_PLATFORM_MACOS)
char path[IO_MAX_PATH_LENGTH];
uint32_t path_size = sizeof(path);
if(_NSGetExecutablePath(path, &path_size))
{
return 0;
}
return io_open(path, IOFLAG_READ);
#else
static const char *NAMES[] = {
"/proc/self/exe", // Linux, Android
"/proc/curproc/exe", // NetBSD
"/proc/curproc/file", // DragonFly
};
for(auto &name : NAMES)
{
IOHANDLE result = io_open(name, IOFLAG_READ);
if(result)
{
return result;
}
}
return 0;
#endif
}
#define ASYNC_BUFSIZE (8 * 1024)
#define ASYNC_LOCAL_BUFSIZE (64 * 1024)
@ -719,17 +719,6 @@ int aio_error(ASYNCIO *aio)
return aio->error;
}
void aio_free(ASYNCIO *aio)
{
aio->lock.lock();
if(aio->thread)
{
thread_detach(aio->thread);
aio->thread = 0;
}
aio_handle_free_and_unlock(aio);
}
void aio_close(ASYNCIO *aio)
{
{
@ -755,6 +744,17 @@ void aio_wait(ASYNCIO *aio)
thread_wait(thread);
}
void aio_free(ASYNCIO *aio)
{
aio->lock.lock();
if(aio->thread)
{
thread_detach(aio->thread);
aio->thread = 0;
}
aio_handle_free_and_unlock(aio);
}
struct THREAD_RUN
{
void (*threadfunc)(void *);

48
src/base/system.h
View file

@ -327,30 +327,6 @@ char *io_read_all_str(IOHANDLE io);
*/
int io_skip(IOHANDLE io, int size);
/**
* Writes data from a buffer to a file.
*
* @ingroup File-IO
*
* @param io Handle to the file.
* @param buffer Pointer to the data that should be written.
* @param size Number of bytes to write.
*
* @return Number of bytes written.
*/
unsigned io_write(IOHANDLE io, const void *buffer, unsigned size);
/**
* Writes a platform dependent newline to a file.
*
* @ingroup File-IO
*
* @param io Handle to the file.
*
* @return `true` on success, `false` on failure.
*/
bool io_write_newline(IOHANDLE io);
/**
* Seeks to a specified offset in the file.
*
@ -386,6 +362,30 @@ long int io_tell(IOHANDLE io);
*/
long int io_length(IOHANDLE io);
/**
* Writes data from a buffer to a file.
*
* @ingroup File-IO
*
* @param io Handle to the file.
* @param buffer Pointer to the data that should be written.
* @param size Number of bytes to write.
*
* @return Number of bytes written.
*/
unsigned io_write(IOHANDLE io, const void *buffer, unsigned size);
/**
* Writes a platform dependent newline to a file.
*
* @ingroup File-IO
*
* @param io Handle to the file.
*
* @return `true` on success, `false` on failure.
*/
bool io_write_newline(IOHANDLE io);
/**
* Closes a file.
*