projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
update.cc
diff --git
a/src/lib/update.cc
b/src/lib/update.cc
index c7527ee493624247468b365cde6b2363acb5496f..c50022091fbe3ab6abb0169e86fa00e7444c4cb3 100644
(file)
--- a/
src/lib/update.cc
+++ b/
src/lib/update.cc
@@
-18,7
+18,6
@@
*/
#include <string>
*/
#include <string>
-#include <sstream>
#include <boost/algorithm/string.hpp>
#include <curl/curl.h>
#include <libcxml/cxml.h>
#include <boost/algorithm/string.hpp>
#include <curl/curl.h>
#include <libcxml/cxml.h>
@@
-26,13
+25,13
@@
#include "update.h"
#include "version.h"
#include "ui_signaller.h"
#include "update.h"
#include "version.h"
#include "ui_signaller.h"
+#include "safe_stringstream.h"
#define BUFFER_SIZE 1024
using std::cout;
using std::min;
using std::string;
#define BUFFER_SIZE 1024
using std::cout;
using std::min;
using std::string;
-using std::stringstream;
using dcp::raw_convert;
/** Singleton instance */
using dcp::raw_convert;
/** Singleton instance */
@@
-90,7
+89,7
@@
UpdateChecker::run ()
void
UpdateChecker::thread ()
{
void
UpdateChecker::thread ()
{
- while (
1
) {
+ while (
true
) {
/* Block until there is something to do */
boost::mutex::scoped_lock lock (_process_mutex);
while (_to_do == 0) {
/* Block until there is something to do */
boost::mutex::scoped_lock lock (_process_mutex);
while (_to_do == 0) {
@@
-113,10
+112,9
@@
UpdateChecker::thread ()
/* Parse the reply */
_buffer[_offset] = '\0';
/* Parse the reply */
_buffer[_offset] = '\0';
- stringstream s;
- s << _buffer;
+ string s (_buffer);
cxml::Document doc ("Update");
cxml::Document doc ("Update");
- doc.read_str
eam
(s);
+ doc.read_str
ing
(s);
{
boost::mutex::scoped_lock lm (_data_mutex);
{
boost::mutex::scoped_lock lm (_data_mutex);