MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/peterix/dfhack

develop
Warmist 2012-03-27 22:48:07 +03:00
parent 2afff2b2c8 d2d16271f0
commit 5e90af7400
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Process-linux.cpp
Unescape Escape View File

@ -131,12 +131,12 @@ void Process::getMemRanges( vector<t_memrange> & ranges )
{
t_memrange temp;
temp.name[0] = 0;
sscanf(buffer, "%zx-%zx %s %zx %2zu:%2zu %zu %[^\n]s",
sscanf(buffer, "%zx-%zx %s %zx %2zx:%2zx %zu %[^\n]",
&start,
&end,
(char*)&permissions,
&offset, &device1, &device2, &node,
(char*)&temp.name);
(char*)temp.name);
temp.start = (void *) start;
temp.end = (void *) end;
temp.read = permissions[0] == 'r';

2
plugins/stonesense

@ -1 +1 @@
Subproject commit f854810fb76a6c83a9ccd3a50f526963b5c85b90
Subproject commit 07ddc8c13e0bb38cde77937803e9320e2b26f2d9