style: update formatting in dynamic_array.h and .clang-format for consistency
Some checks failed
CI / build (push) Has been cancelled
Some checks failed
CI / build (push) Has been cancelled
This commit is contained in:
@@ -6,7 +6,7 @@ UseTab: Never
|
||||
|
||||
ColumnLimit: 100
|
||||
|
||||
BreakBeforeBraces: Allman
|
||||
BreakBeforeBraces: Attach
|
||||
|
||||
AllowShortIfStatementsOnASingleLine: false
|
||||
AllowShortFunctionsOnASingleLine: None
|
||||
@@ -19,4 +19,4 @@ SortIncludes: true
|
||||
|
||||
IndentCaseLabels: true
|
||||
|
||||
AlignEscapedNewlines: Left
|
||||
AlignEscapedNewlines: Right
|
||||
|
||||
@@ -4,7 +4,9 @@
|
||||
#define DYNAMIC_ARRAY_VERSION_MAJOR 0
|
||||
#define DYNAMIC_ARRAY_VERSION_MINOR 1
|
||||
#define DYNAMIC_ARRAY_VERSION_BUILD 0
|
||||
#define DYNAMIC_ARRAY_VERSION ((DYNAMIC_ARRAY_VERSION_MAJOR << 16) | (DYNAMIC_ARRAY_VERSION_MINOR << 8) | DYNAMIC_ARRAY_VERSION_BUILD)
|
||||
#define DYNAMIC_ARRAY_VERSION \
|
||||
((DYNAMIC_ARRAY_VERSION_MAJOR << 16) | (DYNAMIC_ARRAY_VERSION_MINOR << 8) | \
|
||||
DYNAMIC_ARRAY_VERSION_BUILD)
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
@@ -12,8 +14,6 @@
|
||||
#define DYNAMIC_ARRAY_DEFAULT_ARRAY_SIZE 10
|
||||
#define DYNAMIC_ARRAY_CAPACITY_FACTOR 2
|
||||
|
||||
|
||||
|
||||
// [ HEADER | ARRAY ELEMENTS ]
|
||||
// ↑
|
||||
// THIS IS THE POINTER RETURNED BY ALL MACROS
|
||||
@@ -22,33 +22,31 @@ typedef struct {
|
||||
size_t capacity;
|
||||
} ArrayHeader;
|
||||
|
||||
|
||||
#define array_create(arr) \
|
||||
do { \
|
||||
ArrayHeader *header = malloc(sizeof(*arr) * DYNAMIC_ARRAY_DEFAULT_ARRAY_SIZE + sizeof(ArrayHeader)); \
|
||||
ArrayHeader* header = \
|
||||
malloc(sizeof(*arr) * DYNAMIC_ARRAY_DEFAULT_ARRAY_SIZE + sizeof(ArrayHeader)); \
|
||||
header->size = 0; \
|
||||
header->capacity = DYNAMIC_ARRAY_DEFAULT_ARRAY_SIZE; \
|
||||
\
|
||||
arr = (void*)(header + 1); \
|
||||
} while (0)
|
||||
|
||||
|
||||
#define array_get_header(arr) ((ArrayHeader*)(arr) - 1)
|
||||
|
||||
|
||||
#define array_destroy(arr) \
|
||||
do { \
|
||||
free(array_get_header(arr)); \
|
||||
arr = NULL; \
|
||||
} while (0)
|
||||
|
||||
|
||||
#define array_push_value(arr, value) \
|
||||
do { \
|
||||
ArrayHeader* header = array_get_header(arr); \
|
||||
if (header->size + 1 > header->capacity) { \
|
||||
size_t new_capacity = header->capacity * DYNAMIC_ARRAY_CAPACITY_FACTOR; \
|
||||
ArrayHeader *new_header = realloc(header, sizeof(*arr) * new_capacity + sizeof(ArrayHeader)); \
|
||||
ArrayHeader* new_header = \
|
||||
realloc(header, sizeof(*arr) * new_capacity + sizeof(ArrayHeader)); \
|
||||
if (new_header != NULL) { \
|
||||
header = new_header; \
|
||||
} \
|
||||
@@ -59,7 +57,6 @@ typedef struct {
|
||||
header->size++; \
|
||||
} while (0)
|
||||
|
||||
|
||||
#define array_pop(arr) \
|
||||
do { \
|
||||
ArrayHeader* header = array_get_header(arr); \
|
||||
@@ -69,5 +66,4 @@ typedef struct {
|
||||
header->size--; \
|
||||
} while (0)
|
||||
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user