maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* 64-bit compatibility fixes (for problems revealed by building on an Athlon

Browse source 
64 running 64-bit SUSE).  A patched ATerm library is required to run Nix
  succesfully.
This commit is contained in:
Eelco Dolstra 2006-05-11 02:19:43 +00:00
parent e3c07782d1
commit 9d72bf8835
10 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/gc.cc
View file

@ -212,7 +212,7 @@ static void readTempRoots(PathSet & tempRoots, FDs & fds)
string contents = readFile(*fd);
/* Extract the roots. */
unsigned int pos = 0, end;
string::size_type pos = 0, end;
while ((end = contents.find((char) 0, pos)) != string::npos) {
Path root(contents, pos, end - pos);

2
src/libstore/globals.cc
View file

@ -46,7 +46,7 @@ static void readSettings()
line += contents[pos++];
pos++;
unsigned int hash = line.find('#');
string::size_type hash = line.find('#');
if (hash != string::npos)
line = string(line, 0, hash);

2
src/libstore/references.cc
View file

@ -99,7 +99,7 @@ PathSet scanForReferences(const string & path, const PathSet & paths)
have the form `HASH-bla'). */
for (PathSet::const_iterator i = paths.begin(); i != paths.end(); i++) {
string baseName = baseNameOf(*i);
unsigned int pos = baseName.find('-');
string::size_type pos = baseName.find('-');
if (pos == string::npos)
throw Error(format("bad reference `%1%'") % *i);
string s = string(baseName, 0, pos);

4
src/libstore/store.cc
View file

@ -243,7 +243,7 @@ Path toStorePath(const Path & path)
{
if (!isInStore(path))
throw Error(format("path `%1%' is not in the Nix store") % path);
unsigned int slash = path.find('/', nixStore.size() + 1);
Path::size_type slash = path.find('/', nixStore.size() + 1);
if (slash == Path::npos)
return path;
else
@ -563,7 +563,7 @@ static Hash queryHash(const Transaction & txn, const Path & storePath)
{
string s;
nixDB.queryString(txn, dbValidPaths, storePath, s);
unsigned int colon = s.find(':');
string::size_type colon = s.find(':');
if (colon == string::npos)
throw Error(format("corrupt hash `%1%' in valid-path entry for `%2%'")
% s % storePath);