forked from mpruett/audiofile
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix signature of multiplyCheckOverflow. It returns a bool, not an int
- Loading branch information
Showing
3 changed files
with
37 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
patches/08_Fix-signature-of-multiplyCheckOverflow.-It-returns-a-b.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters