42/42_INT_01_libft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change the name of functions in convertbaseFree to distinguish them from convertbase

Browse Source
This commit is contained in:
Hugo LAMY
2020-02-27 20:27:43 +01:00
parent 387758be4d
commit cb9818bc55
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
srcs/ft_convertbase_free.c
View File

@@ -6,7 +6,7 @@
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */ /* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2020/02/26 20:19:54 by hulamy #+# #+# */ /* Created: 2020/02/26 20:19:54 by hulamy #+# #+# */
/* Updated: 2020/02/26 20:20:14 by hulamy ### ########.fr */ /* Updated: 2020/02/27 20:23:22 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -47,7 +47,7 @@
*/ */
int int
is_valid_base(char *base) is_base_valid(char *base)
{ {
int i; int i;
int j; int j;
@@ -76,13 +76,13 @@ int
*/ */
int int
is_valid_nbr(char *nbr, char *base) is_nbr_valid(char *nbr, char *base)
{ {
int i; int i;
int j; int j;
i = 0; i = 0;
if (!is_valid_base(base)) if (!is_base_valid(base))
return (0); return (0);
while (nbr[i]) while (nbr[i])
{ {
@@ -107,7 +107,7 @@ int
*/ */
unsigned long int unsigned long int
base_to_decimal(char *nbr, char *base, int *error) base_2_decimal(char *nbr, char *base, int *error)
{ {
unsigned long int decimal; unsigned long int decimal;
int i; int i;
@@ -140,7 +140,7 @@ unsigned long int
*/ */
char char
*decimal_to_base(unsigned long int decimal, char *base, int malloc_size) *decimal_2_base(unsigned long int decimal, char *base, int malloc_size)
{ {
int base_size; int base_size;
int neg; int neg;
@@ -188,11 +188,11 @@ char
nbr++; nbr++;
length = 1; length = 1;
} }
if (!is_valid_nbr(nbr, base_from) || !is_valid_base(base_to)) if (!is_nbr_valid(nbr, base_from) || !is_base_valid(base_to))
return (NULL); return (NULL);
decimal = base_to_decimal(nbr, base_from, &error); decimal = base_2_decimal(nbr, base_from, &error);
if (error == 1) if (error == 1)
return (NULL); return (NULL);
free(nbr); free(nbr);
return (decimal_to_base(decimal, base_to, length)); return (decimal_2_base(decimal, base_to, length));
} }