diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2009-11-15 12:40:17 +0200 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2009-11-15 12:40:17 +0200 |
| commit | 93e418562cf127a9171e87bcd4e9af8e1bfcdae4 (patch) | |
| tree | ed57e18edfa1758f3763d7b85c370a8926861ccb /src/xzdec | |
| parent | Updated THANKS. (diff) | |
| download | xz-93e418562cf127a9171e87bcd4e9af8e1bfcdae4.tar.xz | |
Add lzma_physmem().
I had hoped to keep liblzma as purely a compression
library as possible (e.g. file I/O will go into
a different library), but it seems that applications
linking agaisnt liblzma need some way to determine
the memory usage limit, and knowing the amount of RAM
is one reasonable way to help making such decisions.
Thanks to Jonathan Nieder for the original patch.
Diffstat (limited to '')
| -rw-r--r-- | src/xzdec/Makefile.am | 6 | ||||
| -rw-r--r-- | src/xzdec/xzdec.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/xzdec/Makefile.am b/src/xzdec/Makefile.am index 9a1b4342..ad487721 100644 --- a/src/xzdec/Makefile.am +++ b/src/xzdec/Makefile.am @@ -17,8 +17,7 @@ bin_PROGRAMS = xzdec lzmadec xzdec_SOURCES = \ xzdec.c \ $(top_srcdir)/src/common/tuklib_progname.c \ - $(top_srcdir)/src/common/tuklib_exit.c \ - $(top_srcdir)/src/common/tuklib_physmem.c + $(top_srcdir)/src/common/tuklib_exit.c if COND_W32 xzdec_SOURCES += xzdec_w32res.rc @@ -43,8 +42,7 @@ xzdec_LDADD += $(LTLIBINTL) lzmadec_SOURCES = \ xzdec.c \ $(top_srcdir)/src/common/tuklib_progname.c \ - $(top_srcdir)/src/common/tuklib_exit.c \ - $(top_srcdir)/src/common/tuklib_physmem.c + $(top_srcdir)/src/common/tuklib_exit.c if COND_W32 lzmadec_SOURCES += lzmadec_w32res.rc diff --git a/src/xzdec/xzdec.c b/src/xzdec/xzdec.c index 4f40f1d6..0abccebb 100644 --- a/src/xzdec/xzdec.c +++ b/src/xzdec/xzdec.c @@ -21,7 +21,6 @@ #include "getopt.h" #include "tuklib_progname.h" #include "tuklib_exit.h" -#include "tuklib_physmem.h" #ifdef TUKLIB_DOSLIKE # include <fcntl.h> @@ -104,7 +103,7 @@ version(void) static void memlimit_set_percentage(uint32_t percentage) { - uint64_t mem = tuklib_physmem(); + uint64_t mem = lzma_physmem(); // If we cannot determine the amount of RAM, use the assumption // set by the configure script. |