Skip to content

Commit

Permalink
Fix signature of multiplyCheckOverflow. It returns a bool, not an int
Browse files Browse the repository at this point in the history
  • Loading branch information
antlarr authored and sbaldovi committed May 30, 2023
1 parent 2ce5764 commit 11e622c
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 2 deletions.
2 changes: 1 addition & 1 deletion libaudiofile/modules/MSADPCM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ int firstBitSet(int x)
#define __has_builtin(x) 0
#endif

int multiplyCheckOverflow(int a, int b, int *result)
bool multiplyCheckOverflow(int a, int b, int *result)
{
#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow))
return __builtin_mul_overflow(a, b, result);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From: Antonio Larrosa <[email protected]>
Date: Fri, 10 Mar 2017 15:40:02 +0100
Subject: Fix signature of multiplyCheckOverflow. It returns a bool, not an int

---
libaudiofile/modules/MSADPCM.cpp | 2 +-
sfcommands/sfconvert.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libaudiofile/modules/MSADPCM.cpp b/libaudiofile/modules/MSADPCM.cpp
index ef9c38c..d8c9553 100644
--- a/libaudiofile/modules/MSADPCM.cpp
+++ b/libaudiofile/modules/MSADPCM.cpp
@@ -116,7 +116,7 @@ int firstBitSet(int x)
#define __has_builtin(x) 0
#endif

-int multiplyCheckOverflow(int a, int b, int *result)
+bool multiplyCheckOverflow(int a, int b, int *result)
{
#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow))
return __builtin_mul_overflow(a, b, result);
diff --git a/sfcommands/sfconvert.c b/sfcommands/sfconvert.c
index 970a3e4..367f7a5 100644
--- a/sfcommands/sfconvert.c
+++ b/sfcommands/sfconvert.c
@@ -60,7 +60,7 @@ int firstBitSet(int x)
#define __has_builtin(x) 0
#endif

-int multiplyCheckOverflow(int a, int b, int *result)
+bool multiplyCheckOverflow(int a, int b, int *result)
{
#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow))
return __builtin_mul_overflow(a, b, result);
2 changes: 1 addition & 1 deletion sfcommands/sfconvert.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ int firstBitSet(int x)
#define __has_builtin(x) 0
#endif

int multiplyCheckOverflow(int a, int b, int *result)
bool multiplyCheckOverflow(int a, int b, int *result)
{
#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow))
return __builtin_mul_overflow(a, b, result);
Expand Down

0 comments on commit 11e622c

Please sign in to comment.