diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2018-03-07 11:00:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-07 11:00:08 +0100 |
| commit | 4452f6e855c3f81b93003f47ebb5d372a7609894 (patch) | |
| tree | bc1e8d62fdd05de5c6f0c583096022c4e909f696 | |
| parent | e917c05628abd0ff429c429d0e814532180b9586 (diff) | |
| parent | 56253bb08fef60f4768ebb2ca013135b0dbf5df3 (diff) | |
Merge pull request #1955 from dtzWill/fix/rand-random
rand() -> random(), since we use srandom().
| -rw-r--r-- | src/libstore/build.cc | 2 | ||||
| -rw-r--r-- | src/libstore/gc.cc | 2 | ||||
| -rw-r--r-- | src/libstore/optimise-store.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 1d611ffba..47a905c81 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1458,7 +1458,7 @@ void replaceValidPath(const Path & storePath, const Path tmpPath) tmpPath (the replacement), so we have to move it out of the way first. We'd better not be interrupted here, because if we're repairing (say) Glibc, we end up with a broken system. */ - Path oldPath = (format("%1%.old-%2%-%3%") % storePath % getpid() % rand()).str(); + Path oldPath = (format("%1%.old-%2%-%3%") % storePath % getpid() % random()).str(); if (pathExists(storePath)) rename(storePath.c_str(), oldPath.c_str()); if (rename(tmpPath.c_str(), storePath.c_str()) == -1) diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index 943b16c28..ba49749d8 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -59,7 +59,7 @@ static void makeSymlink(const Path & link, const Path & target) /* Create the new symlink. */ Path tempLink = (format("%1%.tmp-%2%-%3%") - % link % getpid() % rand()).str(); + % link % getpid() % random()).str(); createSymlink(target, tempLink); /* Atomically replace the old one. */ diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc index 891540ae4..7840167d7 100644 --- a/src/libstore/optimise-store.cc +++ b/src/libstore/optimise-store.cc @@ -213,7 +213,7 @@ void LocalStore::optimisePath_(Activity * act, OptimiseStats & stats, MakeReadOnly makeReadOnly(mustToggle ? dirOf(path) : ""); Path tempLink = (format("%1%/.tmp-link-%2%-%3%") - % realStoreDir % getpid() % rand()).str(); + % realStoreDir % getpid() % random()).str(); if (link(linkPath.c_str(), tempLink.c_str()) == -1) { if (errno == EMLINK) { |