diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-05-08 00:32:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-05-08 00:32:22 -0400 |
| commit | a32d7e1910176deef62583cef5d1195257bf3e17 (patch) | |
| tree | ad3b78d240a77ff5131e2e4f45d4b8aa456815b3 | |
| parent | defe541a3084532eb34bab82341752323cf7efca (diff) | |
| download | tor-a32d7e1910176deef62583cef5d1195257bf3e17.tar tor-a32d7e1910176deef62583cef5d1195257bf3e17.tar.gz | |
Return success when get_total_system_memory() succeeds.
Fixes bug 11805; bugfix on 0.2.5.4-alpha.
| -rw-r--r-- | changes/bug11805 | 5 | ||||
| -rw-r--r-- | src/common/compat.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug11805 b/changes/bug11805 new file mode 100644 index 000000000..02a553894 --- /dev/null +++ b/changes/bug11805 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Correctly detect the total available system memory. We tried to do this + in 0.2.5.4-alpha, but the code was set up to always return an error + value, even on success. + Fixes bug 11805; bugfix on 0.2.5.4-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index 974f697e3..7a444df10 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -3453,6 +3453,6 @@ get_total_system_memory(size_t *mem_out) *mem_out = mem_cached = (size_t) m; - return -1; + return 0; } |