From d7043ef84b73ffc5a96f0a7eaf413d8a6e8a970f Mon Sep 17 00:00:00 2001 From: Adam Potolsky Date: Thu, 25 Jun 2015 09:35:56 -0700 Subject: [PATCH 1/2] Added plugin version output to unix builds #4793 --- src/lib/arch/unix/ArchPluginUnix.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/lib/arch/unix/ArchPluginUnix.cpp b/src/lib/arch/unix/ArchPluginUnix.cpp index 3e390f06..bba2b017 100644 --- a/src/lib/arch/unix/ArchPluginUnix.cpp +++ b/src/lib/arch/unix/ArchPluginUnix.cpp @@ -35,6 +35,7 @@ typedef void (*cleanupFunc)(); void* g_eventTarget = NULL; IEventQueue* g_events = NULL; +static const char kPre174Plugin[] = "Pre-1.7.4"; ArchPluginUnix::ArchPluginUnix() { @@ -82,7 +83,13 @@ ArchPluginUnix::load() String filename = synergy::string::removeFileExt(*it); m_pluginTable.insert(std::make_pair(filename, library)); - LOG((CLOG_DEBUG "loaded plugin: %s", (*it).c_str())); + + const char * version = (char*)invoke( filename.c_str(),"version",NULL); + if (version == NULL) { + version = kPre174Plugin; + } + + LOG((CLOG_DEBUG "loaded plugin: %s (%s)", (*it).c_str(),version)); } } From 4569de54133dd1f727c70c94da2c52afab7faf4e Mon Sep 17 00:00:00 2001 From: Adam Potolsky Date: Thu, 25 Jun 2015 09:44:16 -0700 Subject: [PATCH 2/2] Fixed misplaces statis string in windows code #4793 --- src/lib/arch/win32/ArchPluginWindows.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/arch/win32/ArchPluginWindows.cpp b/src/lib/arch/win32/ArchPluginWindows.cpp index 1f560e06..37440d7c 100644 --- a/src/lib/arch/win32/ArchPluginWindows.cpp +++ b/src/lib/arch/win32/ArchPluginWindows.cpp @@ -34,6 +34,7 @@ typedef void (*cleanupFunc)(); void* g_eventTarget = NULL; IEventQueue* g_events = NULL; +static const char * kPre174Plugin = "Pre-1.7.v"; ArchPluginWindows::ArchPluginWindows() { @@ -69,9 +70,9 @@ ArchPluginWindows::load() String filename = synergy::string::removeFileExt(*it); m_pluginTable.insert(std::make_pair(filename, lib)); - char * version = (char*)invoke( filename.c_str(),"version",NULL); + const char * version = (char*)invoke( filename.c_str(),"version",NULL); if (version == NULL) { - version = "Pre-1.7.4"; + version = kPre174Plugin; } LOG((CLOG_DEBUG "loaded plugin: %s (%s)", (*it).c_str(),version));