Skip to content

Commit 6caa5bb

Browse files
[=] correct codingstyle, [&] still some errors
1 parent 3b475c1 commit 6caa5bb

File tree

4 files changed

+131
-89
lines changed

4 files changed

+131
-89
lines changed

.clang-format

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Generated from CLion C/C++ Code Style settings
2+
---
3+
Language: Cpp
4+
BasedOnStyle: LLVM
5+
AccessModifierOffset: -4
6+
AlignConsecutiveAssignments: false
7+
AlignConsecutiveDeclarations: false
8+
AlignOperands: false
9+
AlignTrailingComments: false
10+
AlwaysBreakTemplateDeclarations: Yes
11+
BraceWrapping:
12+
AfterCaseLabel: true
13+
AfterClass: true
14+
AfterControlStatement: true
15+
AfterEnum: true
16+
AfterFunction: true
17+
AfterNamespace: true
18+
AfterStruct: true
19+
AfterUnion: true
20+
AfterExternBlock: false
21+
BeforeCatch: true
22+
BeforeElse: true
23+
BeforeLambdaBody: true
24+
BeforeWhile: true
25+
SplitEmptyFunction: true
26+
SplitEmptyRecord: true
27+
SplitEmptyNamespace: true
28+
BreakBeforeBraces: Custom
29+
BreakConstructorInitializers: AfterColon
30+
BreakConstructorInitializersBeforeComma: false
31+
ColumnLimit: 120
32+
ConstructorInitializerAllOnOneLineOrOnePerLine: false
33+
IncludeCategories:
34+
- Regex: '^<.*'
35+
Priority: 1
36+
- Regex: '^".*'
37+
Priority: 2
38+
- Regex: '.*'
39+
Priority: 3
40+
IncludeIsMainRegex: '([-_](test|unittest))?$'
41+
IndentCaseBlocks: true
42+
IndentWidth: 4
43+
InsertNewlineAtEOF: true
44+
MacroBlockBegin: ''
45+
MacroBlockEnd: ''
46+
MaxEmptyLinesToKeep: 2
47+
NamespaceIndentation: All
48+
PointerAlignment: Left
49+
SpaceInEmptyParentheses: false
50+
SpacesInAngles: false
51+
SpacesInConditionalStatement: false
52+
SpacesInCStyleCastParentheses: false
53+
SpacesInParentheses: false
54+
TabWidth: 4
55+
UseTab: Always
56+
...

src/cvector_core.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ void *vector_init(size_t item_size, size_t capacity)
1919
header->size = 0;
2020
header->capacity = capacity;
2121
header->initial_capacity = capacity;
22-
2322
return (header + 1);
2423
}
2524

@@ -38,31 +37,30 @@ void *vector_ensure_capacity(void *v, size_t item_count, size_t item_size)
3837
new_capacity = header->capacity * 2;
3938
while (new_capacity < required_capacity)
4039
new_capacity *= 2;
41-
header = realloc(header, sizeof(vector_header_t) + (new_capacity * item_size));
40+
header = realloc(header,
41+
sizeof(vector_header_t) + (new_capacity * item_size));
4242
if (!header)
4343
return NULL;
4444
header->capacity = new_capacity;
45-
4645
return (header + 1);
4746
}
4847

49-
int vector_push_back_impl(void **v, const void *val, size_t count, size_t item_size)
48+
int vector_push_back_impl(void **v, const void *val, size_t count,
49+
size_t item_size)
5050
{
5151
vector_header_t *header;
5252
void *tmp;
5353

5454
if (!v || !val || count == 0 || item_size == 0)
5555
return VECTOR_FAILURE;
56-
if ((uintptr_t)val < 4096)
57-
return VECTOR_FAILURE;
5856
tmp = vector_ensure_capacity(*v, count, item_size);
5957
if (!tmp)
6058
return VECTOR_FAILURE;
6159
*v = tmp;
6260
header = VECTOR_HEADER(*v);
63-
memcpy((unsigned char*)(*v) + (header->size * item_size), val, count * item_size);
61+
memcpy((unsigned char *)(*v) + (header->size * item_size), val,
62+
count * item_size);
6463
header->size += count;
65-
6664
return VECTOR_SUCCESS;
6765
}
6866

src/cvector_insert_erase.c

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
** EPITECH PROJECT, 2024
33
** cvector
44
** File description:
5-
** Insert and erase functions for a C dynamic vector similar to std::vector in C++
5+
** add and del functions for a C dynamic vector similar to std::vector in C++
66
*/
77

88
#include "cvector.h"
99

1010
int vector_insert_impl(void **v, const size_t index, const void *val,
11-
const size_t count, size_t item_size)
11+
const size_t count, size_t item_size)
1212
{
1313
vector_header_t *header;
1414
void *tmp;
@@ -17,8 +17,6 @@ int vector_insert_impl(void **v, const size_t index, const void *val,
1717

1818
if (!v || !val || count == 0 || item_size == 0)
1919
return VECTOR_FAILURE;
20-
if ((uintptr_t)val < 4096)
21-
return VECTOR_FAILURE;
2220
header = (*v) ? VECTOR_HEADER(*v) : NULL;
2321
old_size = header ? header->size : 0;
2422
required_size = ((index > old_size) ? index : old_size) + count;
@@ -33,34 +31,30 @@ int vector_insert_impl(void **v, const size_t index, const void *val,
3331
if (index < old_size)
3432
memmove((unsigned char *)(*v) + (index + count) * item_size,
3533
(unsigned char *)(*v) + index * item_size,
36-
(old_size - index) * item_size);
34+
(old_size - index) * item_size);
3735
memcpy((unsigned char *)(*v) + index * item_size, val, count * item_size);
3836
header->size = required_size;
3937
return VECTOR_SUCCESS;
4038
}
4139

4240
void vector_erase_impl(void **v, const size_t index, size_t count,
43-
const size_t item_size)
41+
const size_t item_size)
4442
{
4543
vector_header_t *header;
4644
//unsigned char *data;
4745
size_t old_size;
4846

4947
if (!v || !*v || count == 0 || item_size == 0)
5048
return;
51-
5249
header = VECTOR_HEADER(*v);
5350
if (index >= header->size)
5451
return;
5552
if (index + count > header->size)
5653
count = header->size - index;
57-
5854
//data = (unsigned char *)*v;
5955
old_size = header->size;
60-
6156
memmove((unsigned char *)*v + index * item_size,
62-
(unsigned char *)*v + (index + count) * item_size,
57+
(unsigned char *)*v + (index + count) * item_size,
6358
(old_size - index - count) * item_size);
64-
6559
header->size = old_size - count;
6660
}

src/cvector_resize.c

Lines changed: 64 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -7,96 +7,90 @@
77

88
#include "cvector.h"
99

10-
int vector_reserve_impl(void **v, const size_t n,
11-
const size_t item_size)
10+
int vector_reserve_impl(void **v, const size_t n, const size_t item_size)
1211
{
13-
vector_header_t *header;
14-
vector_header_t *new_header;
12+
vector_header_t *header;
13+
vector_header_t *new_header;
1514

16-
if (!v || n == 0 || item_size == 0)
17-
return VECTOR_FAILURE;
18-
if (!*v) {
19-
*v = vector_init(item_size, n);
20-
return *v ? VECTOR_SUCCESS : VECTOR_FAILURE;
21-
}
22-
header = VECTOR_HEADER(*v);
23-
if (n <= header->capacity)
15+
if (!v || n == 0 || item_size == 0)
16+
return VECTOR_FAILURE;
17+
if (!*v) {
18+
*v = vector_init(item_size, n);
19+
return *v ? VECTOR_SUCCESS : VECTOR_FAILURE;
20+
}
21+
header = VECTOR_HEADER(*v);
22+
if (n <= header->capacity)
23+
return VECTOR_SUCCESS;
24+
new_header = realloc(header, sizeof(vector_header_t) + (n * item_size));
25+
#warning "TODO: memset new memory"
26+
if (!new_header)
27+
return VECTOR_FAILURE;
28+
new_header->capacity = n;
29+
*v = (new_header + 1);
2430
return VECTOR_SUCCESS;
25-
new_header = realloc(header, sizeof(vector_header_t) + (n * item_size));
26-
#warning "TODO: memset new memory"
27-
if (!new_header)
28-
return VECTOR_FAILURE;
29-
new_header->capacity = n;
30-
*v = (new_header + 1);
31-
32-
return VECTOR_SUCCESS;
3331
}
3432

3533
static inline void *vector_init_zeroed(size_t item_size, size_t capacity)
3634
{
37-
vector_header_t *header;
35+
vector_header_t *header;
3836

39-
if (item_size == 0 || capacity == 0)
40-
return NULL;
41-
header = calloc(1, sizeof(vector_header_t) + item_size * capacity);
42-
if (!header)
43-
return NULL;
44-
header->size = capacity;
45-
header->capacity = capacity;
46-
header->initial_capacity = capacity;
37+
if (item_size == 0 || capacity == 0)
38+
return NULL;
39+
header = calloc(1, sizeof(vector_header_t) + item_size * capacity);
40+
if (!header)
41+
return NULL;
42+
header->size = capacity;
43+
header->capacity = capacity;
44+
header->initial_capacity = capacity;
4745

48-
return (header + 1);
46+
return (header + 1);
4947
}
5048

5149
int vector_resize_impl(void **v, const size_t new_size,
52-
const size_t item_size)
50+
const size_t item_size)
5351
{
54-
vector_header_t *header;
55-
void *tmp;
56-
size_t old_size;
52+
vector_header_t *header;
53+
void *tmp;
54+
size_t old_size;
5755

58-
if (!v || item_size == 0)
59-
return VECTOR_FAILURE;
60-
if (!*v) {
61-
*v = vector_init_zeroed(item_size, new_size);
62-
return (*v) ? VECTOR_SUCCESS : VECTOR_FAILURE;
63-
}
64-
header = VECTOR_HEADER(*v);
65-
old_size = header->size;
66-
if (new_size < old_size) {
56+
if (!v || item_size == 0)
57+
return VECTOR_FAILURE;
58+
if (!*v) {
59+
*v = vector_init_zeroed(item_size, new_size);
60+
return (*v) ? VECTOR_SUCCESS : VECTOR_FAILURE;
61+
}
62+
header = VECTOR_HEADER(*v);
63+
old_size = header->size;
64+
if (new_size < old_size) {
65+
header->size = new_size;
66+
return VECTOR_SUCCESS;
67+
}
68+
if (new_size == old_size)
69+
return VECTOR_SUCCESS;
70+
tmp = vector_ensure_capacity(*v, new_size - old_size, item_size);
71+
if (!tmp)
72+
return VECTOR_FAILURE;
73+
*v = tmp;
74+
header = VECTOR_HEADER(*v);
75+
memset((unsigned char *)(*v) + (old_size * item_size), 0, (new_size - old_size) * item_size);
6776
header->size = new_size;
6877
return VECTOR_SUCCESS;
69-
}
70-
if (new_size == old_size)
71-
return VECTOR_SUCCESS;
72-
tmp = vector_ensure_capacity(*v, new_size - old_size, item_size);
73-
if (!tmp)
74-
return VECTOR_FAILURE;
75-
*v = tmp;
76-
header = VECTOR_HEADER(*v);
77-
memset((unsigned char *)(*v) + (old_size * item_size), 0, (new_size - old_size) * item_size);
78-
header->size = new_size;
79-
80-
return VECTOR_SUCCESS;
8178
}
8279

8380
int vector_shrink_to_fit_impl(void **v, const size_t item_size)
8481
{
85-
vector_header_t *header;
86-
vector_header_t *new_header;
82+
vector_header_t *header;
83+
vector_header_t *new_header;
8784

88-
if (!v || !*v || item_size == 0)
89-
return VECTOR_FAILURE;
90-
91-
header = VECTOR_HEADER(*v);
92-
if (header->capacity == header->size)
85+
if (!v || !*v || item_size == 0)
86+
return VECTOR_FAILURE;
87+
header = VECTOR_HEADER(*v);
88+
if (header->capacity == header->size)
89+
return VECTOR_SUCCESS;
90+
new_header = realloc(header, sizeof(vector_header_t) + (header->size * item_size));
91+
if (!new_header)
92+
return VECTOR_FAILURE;
93+
new_header->capacity = new_header->size;
94+
*v = (new_header + 1);
9395
return VECTOR_SUCCESS;
94-
95-
new_header = realloc(header, sizeof(vector_header_t) + (header->size * item_size));
96-
if (!new_header)
97-
return VECTOR_FAILURE;
98-
99-
new_header->capacity = new_header->size;
100-
*v = (new_header + 1);
101-
return VECTOR_SUCCESS;
10296
}

0 commit comments

Comments
 (0)