aboutsummaryrefslogtreecommitdiff
path: root/src/dstr/ft_dstrgrow.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/dstr/ft_dstrgrow.c')
-rw-r--r--src/dstr/ft_dstrgrow.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/dstr/ft_dstrgrow.c b/src/dstr/ft_dstrgrow.c
index 9ad51ea..40cad86 100644
--- a/src/dstr/ft_dstrgrow.c
+++ b/src/dstr/ft_dstrgrow.c
@@ -6,7 +6,7 @@
/* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/04/03 14:17:09 by charles #+# #+# */
-/* Updated: 2020/04/03 15:09:21 by charles ### ########.fr */
+/* Updated: 2020/04/04 19:56:26 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -14,18 +14,28 @@
#define FT_DSTR_GROWTH_FACTOR 1.5
+/*
+** \brief Grow the capacity of a dynamic string
+** \param dstr Dynamic string to grow
+** \param at_least Minimum capacity - 1 required
+** \return Passed dynamic string or NULL on error
+*/
+
t_ftdstr *ft_dstrgrow(t_ftdstr *dstr, size_t at_least)
{
size_t new_capacity;
char *new_str;
+ if (at_least < dstr->capacity - 1)
+ return (dstr);
new_capacity = dstr->capacity <= 1 ? 2 : dstr->capacity;
- while (new_capacity < at_least)
+ while (at_least > new_capacity - 1)
new_capacity *= FT_DSTR_GROWTH_FACTOR;
if ((new_str = (char*)malloc(sizeof(char) * new_capacity)) == NULL)
return (NULL);
ft_memcpy(new_str, dstr->str, dstr->capacity);
dstr->capacity = new_capacity;
+ free(dstr->str);
dstr->str = new_str;
return (dstr);
}