pEp.foundation
/
libpEpAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Adjust Windows build file. Use _getpid instead of getpid (deprecated alias)

pull/8/head
Thomas 4 years ago
parent
651ce9be45
commit
b4d138f8e3
6 changed files with 287 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      build-windows/libpEpAdapter.vcxproj
  2. 298
      build-windows/libpEpAdapter.vcxproj.filters
  3. 3
      src/group_manager_api.cc
  4. 3
      src/group_manager_api.h
  5. 4
      src/pEpLog.cc
  6. 8
      src/pEpLog.hh

29
build-windows/libpEpAdapter.vcxproj
View File

@ -58,7 +58,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_LIB;_EXPORT_PEP_ENGINE_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnablePREfast>false</EnablePREfast> <EnablePREfast>false</EnablePREfast>
</ClCompile> </ClCompile>
<Link> <Link>
@ -73,7 +73,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_LIB;_EXPORT_PEP_ENGINE_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnablePREfast>false</EnablePREfast> <EnablePREfast>false</EnablePREfast>
</ClCompile> </ClCompile>
<Link> <Link>
@ -86,31 +86,10 @@
<Text Include="ReadMe.txt" /> <Text Include="ReadMe.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\src\Adapter.cc" /> <ClCompile Include="..\src\*.cc" />
<ClCompile Include="..\src\callback_dispatcher.cc" />
<ClCompile Include="..\src\call_with_lock.cc" />
<ClCompile Include="..\src\constant_time_algo.cc" />
<ClCompile Include="..\src\message_cache.cc" />
<ClCompile Include="..\src\passphrase_cache.cc" />
<ClCompile Include="..\src\pEpLog.cc" />
<ClCompile Include="..\src\slurp.cc" />
<ClCompile Include="..\src\status_to_string.cc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\src\Adapter.hh" /> <ClInclude Include="..\src\*.hh" />
<ClInclude Include="..\src\Adapter.hxx" />
<ClInclude Include="..\src\callback_dispatcher.hh" />
<ClInclude Include="..\src\call_with_lock.hh" />
<ClInclude Include="..\src\constant_time_algo.hh" />
<ClInclude Include="..\src\locked_queue.hh" />
<ClInclude Include="..\src\message_cache.hh" />
<ClInclude Include="..\src\passphrase_cache.hh" />
<ClInclude Include="..\src\passphrase_cache.hxx" />
<ClInclude Include="..\src\pc_container.hh" />
<ClInclude Include="..\src\pEpLog.hh" />
<ClInclude Include="..\src\Semaphore.hh" />
<ClInclude Include="..\src\slurp.hh" />
<ClInclude Include="..\src\status_to_string.hh" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\pEpEngine\build-windows\pEpEngine.vcxproj"> <ProjectReference Include="..\..\pEpEngine\build-windows\pEpEngine.vcxproj">

298
build-windows/libpEpAdapter.vcxproj.filters
View File

@ -18,75 +18,327 @@
<Text Include="ReadMe.txt" /> <Text Include="ReadMe.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\src\Adapter.cc"> <ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\call_with_lock.cc"> <ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\callback_dispatcher.cc"> <ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\constant_time_algo.cc"> <ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\message_cache.cc"> <ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\passphrase_cache.cc"> <ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\pEpLog.cc"> <ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\slurp.cc"> <ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\status_to_string.cc"> <ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\*.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\src\call_with_lock.hh"> <ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\Adapter.hh"> <ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\Adapter.hxx"> <ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\callback_dispatcher.hh"> <ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\constant_time_algo.hh"> <ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\locked_queue.hh"> <ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\message_cache.hh"> <ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\passphrase_cache.hh"> <ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\passphrase_cache.hxx"> <ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\pc_container.hh"> <ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\pEpLog.hh"> <ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\Semaphore.hh"> <ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\slurp.hh"> <ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\status_to_string.hh"> <ClInclude Include="..\src\*.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>

3
src/group_manager_api.cc
View File

@ -123,8 +123,7 @@ DYNAMIC_API PEP_STATUS adapter_group_query_groups(PEP_SESSION session, identity_
return status; return status;
} }
DYNAMIC_API PEP_STATUS DYNAMIC_API PEP_STATUS adapter_group_query_manager(PEP_SESSION session, const pEp_identity *const group, pEp_identity **manager)
adapter_group_query_manager(PEP_SESSION session, const pEp_identity *const group, pEp_identity **manager)
{ {
pEpLog("called"); pEpLog("called");
PEP_STATUS status = adapter_grp_manager.group_query_manager(session, group, manager); PEP_STATUS status = adapter_grp_manager.group_query_manager(session, group, manager);

3
src/group_manager_api.h
View File

@ -79,8 +79,7 @@ DYNAMIC_API PEP_STATUS adapter_group_create(
* @warning For recipients to accept the dissolution, the sender/manager key used must be a key that they * @warning For recipients to accept the dissolution, the sender/manager key used must be a key that they
* have a trust entry for. * have a trust entry for.
*/ */
DYNAMIC_API PEP_STATUS DYNAMIC_API PEP_STATUS adapter_group_dissolve(PEP_SESSION session, pEp_identity *group_identity, pEp_identity *manager);
adapter_group_dissolve(PEP_SESSION session, pEp_identity *group_identity, pEp_identity *manager);
/** /**
* <!-- adapter_group_invite_member() --> * <!-- adapter_group_invite_member() -->

4
src/pEpLog.cc
View File

@ -78,7 +78,7 @@ namespace pEp {
string decorate_centered(const string& msg, char decoration) string decorate_centered(const string& msg, char decoration)
{ {
stringstream tmp; stringstream tmp;
int max_len = line_width - 10; size_t max_len = line_width - 10;
// truncate msg // truncate msg
string msg_truncated = msg; string msg_truncated = msg;
if (msg.length() >= max_len) { if (msg.length() >= max_len) {
@ -115,7 +115,7 @@ namespace pEp {
void pEpLogger::log(const string& msg, Utils::Color col) const void pEpLogger::log(const string& msg, Utils::Color col) const
{ {
std::stringstream msg_; std::stringstream msg_;
msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]";
msg_ << " - "; msg_ << " - ";
msg_ << this->get_classname() << "[" << this->get_instancename() << "]"; msg_ << this->get_classname() << "[" << this->get_instancename() << "]";
msg_ << " - " << msg; msg_ << " - " << msg;

8
src/pEpLog.hh
View File

@ -49,7 +49,7 @@
do { \ do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \ if (pEp::Adapter::pEpLog::get_enabled()) { \
std::stringstream msg_; \ std::stringstream msg_; \
msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << msg; \ msg_ << " - " << msg; \
pEp::Adapter::pEpLog::log(msg_.str()); \ pEp::Adapter::pEpLog::log(msg_.str()); \
@ -67,7 +67,7 @@
do { \ do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \ if (pEp::Adapter::pEpLog::get_enabled()) { \
std::stringstream msg_; \ std::stringstream msg_; \
msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << pEp::Adapter::pEpLog::decorateH1(msg); \ msg_ << " - " << pEp::Adapter::pEpLog::decorateH1(msg); \
pEp::Adapter::pEpLog::log(msg_.str()); \ pEp::Adapter::pEpLog::log(msg_.str()); \
@ -85,7 +85,7 @@
do { \ do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \ if (pEp::Adapter::pEpLog::get_enabled()) { \
std::stringstream msg_; \ std::stringstream msg_; \
msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << pEp::Adapter::pEpLog::decorateH2(msg); \ msg_ << " - " << pEp::Adapter::pEpLog::decorateH2(msg); \
pEp::Adapter::pEpLog::log(msg_.str()); \ pEp::Adapter::pEpLog::log(msg_.str()); \
@ -176,7 +176,7 @@ namespace pEp {
#define pEpLogClass(msg) \ #define pEpLogClass(msg) \
do { \ do { \
std::stringstream msg_; \ std::stringstream msg_; \
msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << this->m4gic_logger_n4me.get_classname(); \ msg_ << " - " << this->m4gic_logger_n4me.get_classname(); \
msg_ << "[" << this->m4gic_logger_n4me.get_instancename() << "]"; \ msg_ << "[" << this->m4gic_logger_n4me.get_instancename() << "]"; \
msg_ << "::" << __FUNCTION__; \ msg_ << "::" << __FUNCTION__; \

Write Preview
Loading…
Cancel
Save