diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2009-05-26 12:22:10 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2009-05-26 12:22:10 +0000 |
| commit | 3a5c27763f4483f42851c127547e6db0fc5b69bc (patch) | |
| tree | c4958758a373572f071b81d8dd19fe0b37d9a05f /util/cbfstool/tools/lzma | |
| parent | bbe29ee06e7030bbba6e2c8c5790e785bf7f0c5b (diff) | |
Cosmetic cbfstool update (trivial)
* remove some dead code
* fix indentation
* comment in some destructors and fix some other warnings
* use HOSTCC instead of CC (not all the way cosmetic, but very simple)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4299 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/cbfstool/tools/lzma')
| -rw-r--r-- | util/cbfstool/tools/lzma/C/7zip/Compress/LZ/IMatchFinder.h | 2 | ||||
| -rw-r--r-- | util/cbfstool/tools/lzma/C/Common/MyWindows.h | 2 | ||||
| -rw-r--r-- | util/cbfstool/tools/lzma/minilzma.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/util/cbfstool/tools/lzma/C/7zip/Compress/LZ/IMatchFinder.h b/util/cbfstool/tools/lzma/C/7zip/Compress/LZ/IMatchFinder.h index 9459f210d8..8b8480b2d2 100644 --- a/util/cbfstool/tools/lzma/C/7zip/Compress/LZ/IMatchFinder.h +++ b/util/cbfstool/tools/lzma/C/7zip/Compress/LZ/IMatchFinder.h @@ -26,7 +26,7 @@ struct IMatchFinder: public IInWindowStream struct IMatchFinderSetNumPasses { - //virtual ~IMatchFinderSetNumPasses(){} + virtual ~IMatchFinderSetNumPasses(){} virtual void SetNumPasses(UInt32 numPasses) PURE; }; diff --git a/util/cbfstool/tools/lzma/C/Common/MyWindows.h b/util/cbfstool/tools/lzma/C/Common/MyWindows.h index 4ac3dfc5c2..0212fa77a3 100644 --- a/util/cbfstool/tools/lzma/C/Common/MyWindows.h +++ b/util/cbfstool/tools/lzma/C/Common/MyWindows.h @@ -101,7 +101,7 @@ typedef LONG SCODE; struct IUnknown { - //virtual ~IUnknown() {} + virtual ~IUnknown() {} STDMETHOD(QueryInterface) (REFIID iid, void **outObject) PURE; STDMETHOD_(ULONG, AddRef)() PURE; STDMETHOD_(ULONG, Release)() PURE; diff --git a/util/cbfstool/tools/lzma/minilzma.cc b/util/cbfstool/tools/lzma/minilzma.cc index 7610910a19..5437b59946 100644 --- a/util/cbfstool/tools/lzma/minilzma.cc +++ b/util/cbfstool/tools/lzma/minilzma.cc @@ -303,12 +303,12 @@ void do_lzma_compress(char *in, int in_len, char *out, int *out_len) { void do_lzma_uncompress(char *dst, int dst_len, char *src, int src_len) { std::vector<unsigned char> result; result = LZMADeCompress(std::vector<unsigned char>(src, src + src_len)); - if (result.size() <= dst_len) + if (result.size() <= (SizeT)dst_len) std::memcpy(dst, &result[0], result.size()); else { fprintf(stderr, "Not copying %d bytes to %d-byte buffer!\n", - result.size(), dst_len); + (unsigned int)result.size(), dst_len); exit(1); } } |