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

Removed usages of "std::istringstream" and "std::stringstream".

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5135 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-05-03 13:41:03 +00:00
parent 5b23a0e112
commit 3718d6ecfa
7 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libretroshare/src/dbase/fimonitor.cc
View file

@ -34,7 +34,6 @@
#include <errno.h>
#include <iostream>
#include <sstream> // for std::istringstream
#include <iomanip>
#include <dirent.h>
@ -131,9 +130,8 @@ HashCache::HashCache(const std::string& path)
f.getline(buff,max_line_size,'\n') ; //if(sscanf(buff,"%llu",&info.size) != 1) break ;
std::istringstream ss(buff) ;
info.size = 0 ;
ss >> info.size ;
sscanf(buff, UINT64FMT, &info.size);
f.getline(buff,max_line_size,'\n') ; if(sscanf(buff,"%ld",&info.time_stamp) != 1) break ;
f.getline(buff,max_line_size,'\n') ; if(sscanf(buff,"%ld",&info.modf_stamp) != 1) break ;

44
libretroshare/src/dbase/findex.cc
View file

@ -31,7 +31,6 @@
#include <stdlib.h>
#include <algorithm>
#include <iostream>
#include <sstream> // for std::stringstream
#include <tr1/unordered_set>
#include <iomanip>
#include <fstream>
@ -725,11 +724,11 @@ int FileIndex::loadIndex(const std::string& filename, const std::string& expecte
/* load file into memory, close file */
char ibuf[512];
std::stringstream ss;
std::string s;
while(!file.eof())
{
file.read(ibuf, 512);
ss.write(ibuf, file.gcount());
s.append(ibuf, file.gcount());
}
file.close();
@ -737,7 +736,7 @@ int FileIndex::loadIndex(const std::string& filename, const std::string& expecte
unsigned char sha_buf[SHA_DIGEST_LENGTH];
SHA_CTX *sha_ctx = new SHA_CTX;
SHA1_Init(sha_ctx);
SHA1_Update(sha_ctx, ss.str().c_str(), ss.str().length());
SHA1_Update(sha_ctx, s.c_str(), s.length());
SHA1_Final(&sha_buf[0], sha_ctx);
delete sha_ctx;
@ -757,17 +756,24 @@ int FileIndex::loadIndex(const std::string& filename, const std::string& expecte
return 0;
}
#define FIND_NEXT(s,start,end,c) end = s.find(c, start); if (end == std::string::npos) end = s.length();
DirEntry *ndir = NULL;
FileEntry *nfile = NULL;
std::list<DirEntry *> dirlist;
std::string word;
char ch;
while(ss.get(ch))
std::string::size_type pos = 0;
while (pos < s.length())
{
ch = s[pos];
++pos;
if (ch == '-')
{
ss.ignore(256, '\n');
FIND_NEXT(s, pos, pos, '\n');
++pos;
switch(dirlist.size())
{
/* parse error: out of directory */
@ -820,25 +826,27 @@ int FileIndex::loadIndex(const std::string& filename, const std::string& expecte
// Ignore comments
else if (ch == '#')
{
ss.ignore(256, '\n');
FIND_NEXT(s, pos, pos, '\n');
++pos;
}
else {
std::vector<std::string> tokens;
/* parse line */
while(1)
std::string::size_type lineend;
FIND_NEXT(s, pos, lineend, '\n');
std::string line = s.substr(pos, lineend - pos);
pos = lineend + 1;
std::string::size_type start = 0;
while (start < line.length())
{
getline(ss, word, FILE_CACHE_SEPARATOR_CHAR);
if (ss.eof())
goto error;
tokens.push_back(word);
if (ss.peek() == '\n')
{
ss.ignore(256, '\n');
break;
}
std::string::size_type end;
FIND_NEXT(line, start, end, FILE_CACHE_SEPARATOR_CHAR);
tokens.push_back(line.substr(start, end - start));
start = end + 1;
}
/* create new file and add it to last directory*/
if (ch == 'f')
{