diff options
| author | Charles <sircharlesaze@gmail.com> | 2020-04-02 11:20:44 +0200 |
|---|---|---|
| committer | Charles <sircharlesaze@gmail.com> | 2020-04-02 11:20:44 +0200 |
| commit | a2452f88fffffe4e2a278578de5ac961858a5b72 (patch) | |
| tree | 794727721e851a3d90cf3d80096bf5585c5de7bd /src | |
| parent | 1925805cc760061d5742f9d215998561fcd45211 (diff) | |
| download | libft-a2452f88fffffe4e2a278578de5ac961858a5b72.tar.gz libft-a2452f88fffffe4e2a278578de5ac961858a5b72.tar.bz2 libft-a2452f88fffffe4e2a278578de5ac961858a5b72.zip | |
Fixed ft_vecgrow, Added ft_vecinsert
Diffstat (limited to 'src')
| -rw-r--r-- | src/vec/ft_vecgrow.c | 4 | ||||
| -rw-r--r-- | src/vec/ft_vecinsert.c | 36 | ||||
| -rw-r--r-- | src/vec/ft_vecpush.c | 2 |
3 files changed, 39 insertions, 3 deletions
diff --git a/src/vec/ft_vecgrow.c b/src/vec/ft_vecgrow.c index bb8b8c7..2213c88 100644 --- a/src/vec/ft_vecgrow.c +++ b/src/vec/ft_vecgrow.c @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/01 19:13:07 by charles #+# #+# */ -/* Updated: 2020/04/01 21:15:20 by charles ### ########.fr */ +/* Updated: 2020/04/02 10:43:01 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -35,7 +35,7 @@ t_ftvec *ft_vecgrow(t_ftvec *vec) new_capacity = vec->capacity * FT_VEC_GROWTH_FACTOR; if ((new_data = (void**)malloc(sizeof(void*) * new_capacity)) == NULL) return (NULL); - ft_memcpy(new_data, vec->data, vec->size); + ft_memcpy(new_data, vec->data, vec->size * sizeof(void*)); free(vec->data); vec->data = new_data; vec->capacity = new_capacity; diff --git a/src/vec/ft_vecinsert.c b/src/vec/ft_vecinsert.c new file mode 100644 index 0000000..1682daa --- /dev/null +++ b/src/vec/ft_vecinsert.c @@ -0,0 +1,36 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_vecinsert.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/04/02 10:46:59 by charles #+# #+# */ +/* Updated: 2020/04/02 11:04:19 by charles ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft_vec.h" + +/* +** \brief Insert element in vector +** \param vec Vector where element is inserted +** \param i Index where element should be inserted, +** bound checking is performed +** \param elem Element to insert +** \return Passed vector or NULL on error +*/ + +t_ftvec *ft_vecinsert(t_ftvec *vec, size_t i, void *elem) +{ + if (i > vec->size) + return (NULL); + if (vec->capacity <= vec->size) + if (ft_vecgrow(vec) == NULL) + return (NULL); + ft_memmove(vec->data + i + 1, vec->data + i, + (vec->size - i) * sizeof(void*)); + vec->data[i] = elem; + vec->size++; + return (vec); +} diff --git a/src/vec/ft_vecpush.c b/src/vec/ft_vecpush.c index fc903ef..026ae3d 100644 --- a/src/vec/ft_vecpush.c +++ b/src/vec/ft_vecpush.c @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/01 19:22:20 by charles #+# #+# */ -/* Updated: 2020/04/01 20:20:06 by charles ### ########.fr */ +/* Updated: 2020/04/02 10:51:38 by charles ### ########.fr */ /* */ /* ************************************************************************** */ |