From 697606b0a741c5e537ecd5a746ffb2cc7793dd12 Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 25 Dec 2014 09:47:12 +0000 Subject: [PATCH] .cosmetics git-svn-id: svn://ultimatepp.org/upp/trunk@8004 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/Rpc/Client.cpp | 6 ++++-- uppsrc/Core/Util.cpp | 11 ++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/uppsrc/Core/Rpc/Client.cpp b/uppsrc/Core/Rpc/Client.cpp index c83c2d4c1..7e8a4fb9d 100644 --- a/uppsrc/Core/Rpc/Client.cpp +++ b/uppsrc/Core/Rpc/Client.cpp @@ -119,22 +119,24 @@ RpcGet RpcRequest::Execute() request = XmlHeader(); request << XmlTag("methodCall")(XmlTag("methodName")(method) + FormatXmlRpcParams(data.out)); } - if(sLogRpcCalls) + if(sLogRpcCalls) { if(sLogRpcCallsCompress) RLOG("XmlRpc call request:\n" << CompressLog(request)); else RLOG("XmlRpc call request:\n" << request); + } String response; New(); if(shorted) response = RpcExecute(request, "", "127.0.0.1"); else response = Post(request).Execute(); - if(sLogRpcCalls) + if(sLogRpcCalls) { if(sLogRpcCallsCompress) RLOG("XmlRpc call response:\n" << CompressLog(response)); else RLOG("XmlRpc call response:\n" << response); + } RpcGet h; if(IsNull(response)) { faultCode = RPC_CLIENT_HTTP_ERROR; diff --git a/uppsrc/Core/Util.cpp b/uppsrc/Core/Util.cpp index 6a03f1d6c..476d1fac7 100644 --- a/uppsrc/Core/Util.cpp +++ b/uppsrc/Core/Util.cpp @@ -798,11 +798,12 @@ static void LinuxBeep(const char *name) } String fn = "/usr/share/sounds/" + CurrentSoundTheme + "/stereo/dialog-" + name; - system(player + " -q " + fn + (FileExists(fn + ".ogg") ? ".ogg" : - FileExists(fn + ".oga") ? ".oga" : - FileExists(fn + ".wav") ? ".wav" : - ".*") - + " >/dev/null 2>/dev/null&"); + IGNORE_RESULT(system(player + " -q " + fn + + (FileExists(fn + ".ogg") ? ".ogg" : + FileExists(fn + ".oga") ? ".oga" : + FileExists(fn + ".wav") ? ".wav" : + ".*") + + " >/dev/null 2>/dev/null&")); } #endif