Skip to content

ext/bcmath: Avoid unnecessary memset #14180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 16, 2024
Merged

ext/bcmath: Avoid unnecessary memset #14180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd1b092
Avoid unnecessary memset
SakiTakamachi May 8, 2024
bc5962c
Merge branch 'master' into refactor_bcmath_do_sub_2
SakiTakamachi May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ext/bcmath/libbcmath/src/add.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ bc_num bc_add(bc_num n1, bc_num n2, size_t scale_min)
switch (_bc_do_compare(n1, n2, false)) {
case -1:
/* n1 is less than n2, subtract n1 from n2. */
sum = _bc_do_sub(n2, n1, scale_min);
sum = _bc_do_sub(n2, n1);
sum->n_sign = n2->n_sign;
break;
case 0:
Expand All @@ -61,7 +61,7 @@ bc_num bc_add(bc_num n1, bc_num n2, size_t scale_min)
break;
case 1:
/* n2 is less than n1, subtract n2 from n1. */
sum = _bc_do_sub(n1, n2, scale_min);
sum = _bc_do_sub(n1, n2);
sum->n_sign = n1->n_sign;
}
}
Expand Down
4 changes: 2 additions & 2 deletions ext/bcmath/libbcmath/src/doaddsub.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ bc_num _bc_do_add(bc_num n1, bc_num n2, size_t scale_min)
returned. The signs of N1 and N2 are ignored. Also, N1 is
assumed to be larger than N2. SCALE_MIN is the minimum scale
of the result. */
bc_num _bc_do_sub(bc_num n1, bc_num n2, size_t scale_min)
bc_num _bc_do_sub(bc_num n1, bc_num n2)
{
bc_num diff;
/* The caller is guaranteed that n1 is always large. */
Expand All @@ -137,7 +137,7 @@ bc_num _bc_do_sub(bc_num n1, bc_num n2, size_t scale_min)
char *n1ptr, *n2ptr, *diffptr;

/* Allocate temporary storage. */
diff = bc_new_num (diff_len, MAX(diff_scale, scale_min));
diff = bc_new_num_nonzeroed(diff_len, diff_scale);

/* Initialize the subtract. */
n1ptr = (char *) (n1->n_value + n1->n_len + n1->n_scale - 1);
Expand Down
2 changes: 1 addition & 1 deletion ext/bcmath/libbcmath/src/private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,5 @@ inline uint64_t BSWAP64(uint64_t u)
/* routines */
int _bc_do_compare (bc_num n1, bc_num n2, bool use_sign);
bc_num _bc_do_add (bc_num n1, bc_num n2, size_t scale_min);
bc_num _bc_do_sub (bc_num n1, bc_num n2, size_t scale_min);
bc_num _bc_do_sub (bc_num n1, bc_num n2);
void _bc_rm_leading_zeros (bc_num num);
4 changes: 2 additions & 2 deletions ext/bcmath/libbcmath/src/sub.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ bc_num bc_sub(bc_num n1, bc_num n2, size_t scale_min)
switch (_bc_do_compare(n1, n2, false)) {
case -1:
/* n1 is less than n2, subtract n1 from n2. */
diff = _bc_do_sub(n2, n1, scale_min);
diff = _bc_do_sub(n2, n1);
diff->n_sign = (n2->n_sign == PLUS ? MINUS : PLUS);
break;
case 0: {
Expand All @@ -63,7 +63,7 @@ bc_num bc_sub(bc_num n1, bc_num n2, size_t scale_min)
}
case 1:
/* n2 is less than n1, subtract n2 from n1. */
diff = _bc_do_sub(n1, n2, scale_min);
diff = _bc_do_sub(n1, n2);
diff->n_sign = n1->n_sign;
break;
}
Expand Down
Loading