diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2010-02-22 14:23:47 +0100 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2010-02-22 14:23:47 +0100 |
| commit | 57a40848848274a83313f0d57bb184307e0ff87b (patch) | |
| tree | 562de7e644892982f4ad885d065ea71e60181fc2 /extra | |
| parent | 7d8bed112c7ddb59b134102f36999dedce370823 (diff) | |
| download | mariadb-git-57a40848848274a83313f0d57bb184307e0ff87b.tar.gz | |
Bug #43414 Parenthesis (and other) warnings compiling
MySQL with gcc 4.3.2
This is the final patch in the context of this bug.
cmd-line-utils/readline/rlmbutil.h:
Changed in a previous patch, reverted by a backport.
cmd-line-utils/readline/text.c:
Static var initialization.
extra/yassl/include/yassl_error.hpp:
SetErrorString handles errors outside of the YasslError
enum.
extra/yassl/src/ssl.cpp:
SetErrorString handles errors outside of the YasslError
enum.
extra/yassl/src/yassl_error.cpp:
SetErrorString handles errors outside of the YasslError
enum.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/include/yassl_error.hpp | 2 | ||||
| -rw-r--r-- | extra/yassl/src/ssl.cpp | 2 | ||||
| -rw-r--r-- | extra/yassl/src/yassl_error.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/extra/yassl/include/yassl_error.hpp b/extra/yassl/include/yassl_error.hpp index 63fa9a761ba..d2473fb3e2b 100644 --- a/extra/yassl/include/yassl_error.hpp +++ b/extra/yassl/include/yassl_error.hpp @@ -64,7 +64,7 @@ enum YasslError { enum Library { yaSSL_Lib = 0, CryptoLib, SocketLib }; enum { MAX_ERROR_SZ = 80 }; -void SetErrorString(YasslError, char*); +void SetErrorString(unsigned long, char*); /* remove for now, if go back to exceptions use this wrapper // Base class for all yaSSL exceptions diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp index 29aa034f885..4d8b6ac69b8 100644 --- a/extra/yassl/src/ssl.cpp +++ b/extra/yassl/src/ssl.cpp @@ -991,7 +991,7 @@ char* ERR_error_string(unsigned long errNumber, char* buffer) static char* msg = (char*)"Please supply a buffer for error string"; if (buffer) { - SetErrorString(YasslError(errNumber), buffer); + SetErrorString(errNumber, buffer); return buffer; } diff --git a/extra/yassl/src/yassl_error.cpp b/extra/yassl/src/yassl_error.cpp index a1ef8578da6..dd30348cd93 100644 --- a/extra/yassl/src/yassl_error.cpp +++ b/extra/yassl/src/yassl_error.cpp @@ -55,7 +55,7 @@ Library Error::get_lib() const */ -void SetErrorString(YasslError error, char* buffer) +void SetErrorString(unsigned long error, char* buffer) { using namespace TaoCrypt; const int max = MAX_ERROR_SZ; // shorthand |