diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-05-20 12:26:43 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-05-20 12:26:43 -0700 |
| commit | 6e86c4700b142feacd406408eac66be17a4bec47 (patch) | |
| tree | 00bc490caea22a2724bd60c649ab12e5e1e4c22b /src | |
| parent | 5a8398e55a5f2bc0ce95c1e5da06c11365af0764 (diff) | |
| parent | 00fb08158d8a3a0d00f9d0360f376782b42f7d02 (diff) | |
Merge pull request #1363 from Diapolo/remove_strncasecmp
remove strncasecmp() + strnicmp() calls use boost::algorithm::istarts_with()
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 3 | ||||
| -rw-r--r-- | src/qt/bitcoin.cpp | 13 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/init.cpp b/src/init.cpp index e0c0c893aa..0ddcd558a1 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -13,6 +13,7 @@ #include <boost/filesystem/fstream.hpp> #include <boost/filesystem/convenience.hpp> #include <boost/interprocess/sync/file_lock.hpp> +#include <boost/algorithm/string/predicate.hpp> #ifndef WIN32 #include <signal.h> @@ -126,7 +127,7 @@ bool AppInit(int argc, char* argv[]) // Command-line RPC for (int i = 1; i < argc; i++) - if (!IsSwitchChar(argv[i][0]) && !(strlen(argv[i]) > 7 && strncasecmp(argv[i], "bitcoin:", 8) == 0)) + if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "bitcoin:")) fCommandLine = true; if (fCommandLine) diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 07bdee0886..bdc6ea6ffd 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -21,6 +21,7 @@ #include <QLibraryInfo> #include <boost/interprocess/ipc/message_queue.hpp> +#include <boost/algorithm/string/predicate.hpp> #if defined(BITCOIN_NEED_QT_PLUGINS) && !defined(_BITCOIN_QT_PLUGINS_INCLUDED) #define _BITCOIN_QT_PLUGINS_INCLUDED @@ -160,9 +161,6 @@ void HelpMessageBox::exec() #endif } -#ifdef WIN32 -#define strncasecmp strnicmp -#endif #ifndef BITCOIN_QT_TEST int main(int argc, char *argv[]) { @@ -172,7 +170,7 @@ int main(int argc, char *argv[]) // Do this early as we don't want to bother initializing if we are just calling IPC for (int i = 1; i < argc; i++) { - if (strlen(argv[i]) > 7 && strncasecmp(argv[i], "bitcoin:", 8) == 0) + if (boost::algorithm::istarts_with(argv[i], "bitcoin:")) { const char *strURI = argv[i]; try { @@ -312,17 +310,16 @@ int main(int argc, char *argv[]) { window.show(); } +#if !defined(MAC_OSX) && !defined(WIN32) +// TODO: implement qtipcserver.cpp for Mac and Windows // Place this here as guiref has to be defined if we dont want to lose URIs ipcInit(); -#if !defined(MAC_OSX) && !defined(WIN32) -// TODO: implement qtipcserver.cpp for Mac and Windows - // Check for URI in argv for (int i = 1; i < argc; i++) { - if (strlen(argv[i]) > 7 && strncasecmp(argv[i], "bitcoin:", 8) == 0) + if (boost::algorithm::istarts_with(argv[i], "bitcoin:")) { const char *strURI = argv[i]; try { |