Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-08 09:05:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed some std::ostringstream.

Browse source 
To be continued.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5104 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-04-15 14:37:44 +00:00
parent 83bd45caa4
commit 470951d664
10 changed files with 136 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

85
libretroshare/src/util/rsprint.cc
View file

@ -25,34 +25,40 @@
*/
#include "util/rsprint.h"
#include "util/rsstring.h"
#include <iomanip>
#include <sstream>
#include <openssl/sha.h>
#include <sys/time.h>
std::string RsUtil::BinToHex(std::string bin)
#ifdef WINDOWS_SYS
#include <time.h>
#include <sys/timeb.h>
#endif
std::string RsUtil::BinToHex(const std::string &bin)
{
return BinToHex(bin.c_str(), bin.length());
}
std::string RsUtil::BinToHex(const char *arr, const uint32_t len)
{
std::ostringstream out;
std::string out;
for(uint32_t j = 0; j < len; j++)
{
out << std::hex << std::setw(2) << std::setfill('0') << (int32_t) (((const uint8_t *) arr)[j]);
}
return out.str();
for(uint32_t j = 0; j < len; j++)
{
rs_sprintf_append(out, "%02x", (int32_t) (((const uint8_t *) arr)[j]));
}
return out;
}
std::string RsUtil::HashId(std::string id, bool reverse)
std::string RsUtil::HashId(const std::string &id, bool reverse)
{
std::string hash;
std::string tohash;
if (reverse)
{
std::string::reverse_iterator rit;
std::string::const_reverse_iterator rit;
for(rit = id.rbegin(); rit != id.rend(); rit++)
{
tohash += (*rit);
@ -81,43 +87,24 @@ std::string RsUtil::HashId(std::string id, bool reverse)
return hash;
}
#ifdef WINDOWS_SYS
#include <time.h>
#include <sys/timeb.h>
#endif
#include <sys/time.h>
#include <sstream>
#include <iomanip>
static double getCurrentTS();
//static double getCurrentTS()
//{
//#ifndef WINDOWS_SYS
// struct timeval cts_tmp;
// gettimeofday(&cts_tmp, NULL);
// double cts = (cts_tmp.tv_sec) + ((double) cts_tmp.tv_usec) / 1000000.0;
//#else
// struct _timeb timebuf;
// _ftime( &timebuf);
// double cts = (timebuf.time) + ((double) timebuf.millitm) / 1000.0;
//#endif
// return cts;
//}
// Little fn to get current timestamp in an independent manner.
std::string RsUtil::AccurateTimeString()
{
std::ostringstream out;
out << std::setprecision(15) << getCurrentTS();
return out.str();
}
static double getCurrentTS()
{
#ifndef WINDOWS_SYS
struct timeval cts_tmp;
gettimeofday(&cts_tmp, NULL);
double cts = (cts_tmp.tv_sec) + ((double) cts_tmp.tv_usec) / 1000000.0;
#else
struct _timeb timebuf;
_ftime( &timebuf);
double cts = (timebuf.time) + ((double) timebuf.millitm) / 1000.0;
#endif
return cts;
}
//std::string RsUtil::AccurateTimeString()
//{
// std::ostringstream out; // please do not use std::stringstream
// out << std::setprecision(15) << getCurrentTS();
// return out.str();
//}