Code-style consistency improvement:
Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files. make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type. This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
@@ -5,43 +5,39 @@
|
||||
#define ENET_BUILDING_LIB 1
|
||||
#include "enet/enet.h"
|
||||
|
||||
static ENetCallbacks callbacks = { malloc, free, abort };
|
||||
static ENetCallbacks callbacks = {malloc, free, abort};
|
||||
|
||||
int
|
||||
enet_initialize_with_callbacks (ENetVersion version, const ENetCallbacks * inits)
|
||||
int enet_initialize_with_callbacks(ENetVersion version, const ENetCallbacks* inits)
|
||||
{
|
||||
if (version < ENET_VERSION_CREATE (1, 3, 0))
|
||||
return -1;
|
||||
if (version < ENET_VERSION_CREATE(1, 3, 0))
|
||||
return -1;
|
||||
|
||||
if (inits -> malloc != NULL || inits -> free != NULL)
|
||||
{
|
||||
if (inits -> malloc == NULL || inits -> free == NULL)
|
||||
return -1;
|
||||
if (inits->malloc != NULL || inits->free != NULL)
|
||||
{
|
||||
if (inits->malloc == NULL || inits->free == NULL)
|
||||
return -1;
|
||||
|
||||
callbacks.malloc = inits -> malloc;
|
||||
callbacks.free = inits -> free;
|
||||
}
|
||||
|
||||
if (inits -> no_memory != NULL)
|
||||
callbacks.no_memory = inits -> no_memory;
|
||||
callbacks.malloc = inits->malloc;
|
||||
callbacks.free = inits->free;
|
||||
}
|
||||
|
||||
return enet_initialize ();
|
||||
}
|
||||
|
||||
void *
|
||||
enet_malloc (size_t size)
|
||||
{
|
||||
void * memory = callbacks.malloc (size);
|
||||
if (inits->no_memory != NULL)
|
||||
callbacks.no_memory = inits->no_memory;
|
||||
|
||||
if (memory == NULL)
|
||||
callbacks.no_memory ();
|
||||
|
||||
return memory;
|
||||
return enet_initialize();
|
||||
}
|
||||
|
||||
void
|
||||
enet_free (void * memory)
|
||||
void* enet_malloc(size_t size)
|
||||
{
|
||||
callbacks.free (memory);
|
||||
void* memory = callbacks.malloc(size);
|
||||
|
||||
if (memory == NULL)
|
||||
callbacks.no_memory();
|
||||
|
||||
return memory;
|
||||
}
|
||||
|
||||
void enet_free(void* memory)
|
||||
{
|
||||
callbacks.free(memory);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user