fix typos
This commit is contained in:
committed by
Markus F.X.J. Oberhumer
parent
76b2cec8ee
commit
62265a1bc9
+3
-3
@@ -437,7 +437,7 @@ off_t PackLinuxElf::pack3(OutputFile *fo, Filter &ft) // return length of output
|
|||||||
// FIXME: debugging aid: entry to decompressor
|
// FIXME: debugging aid: entry to decompressor
|
||||||
if (lowmem.getSize()) {
|
if (lowmem.getSize()) {
|
||||||
Elf32_Ehdr *const ehdr = (Elf32_Ehdr *)&lowmem[0];
|
Elf32_Ehdr *const ehdr = (Elf32_Ehdr *)&lowmem[0];
|
||||||
set_te32(&ehdr->e_entry, sz_pack2); // hint for decomperssor
|
set_te32(&ehdr->e_entry, sz_pack2); // hint for decompressor
|
||||||
}
|
}
|
||||||
// end debugging aid
|
// end debugging aid
|
||||||
|
|
||||||
@@ -5126,7 +5126,7 @@ int PackLinuxElf32::pack2(OutputFile *fo, Filter &ft)
|
|||||||
fo->seek(x.offset, SEEK_SET);
|
fo->seek(x.offset, SEEK_SET);
|
||||||
fo->write(&file_image[x.offset], x.size);
|
fo->write(&file_image[x.offset], x.size);
|
||||||
total_out += x.size;
|
total_out += x.size;
|
||||||
// Kepp the input side in sync
|
// Keep the input side in sync
|
||||||
total_in += x.size;
|
total_in += x.size;
|
||||||
fi->seek(x.size + x.offset, SEEK_SET);
|
fi->seek(x.size + x.offset, SEEK_SET);
|
||||||
}
|
}
|
||||||
@@ -5384,7 +5384,7 @@ int PackLinuxElf64::pack2(OutputFile *fo, Filter &ft)
|
|||||||
fo->seek(x.offset, SEEK_SET);
|
fo->seek(x.offset, SEEK_SET);
|
||||||
fo->write(&file_image[x.offset], x.size);
|
fo->write(&file_image[x.offset], x.size);
|
||||||
total_out += x.size;
|
total_out += x.size;
|
||||||
// Kepp the input side in sync
|
// Keep the input side in sync
|
||||||
total_in += x.size;
|
total_in += x.size;
|
||||||
fi->seek(x.size + x.offset, SEEK_SET);
|
fi->seek(x.size + x.offset, SEEK_SET);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -99,7 +99,7 @@ int PackHeader::getPackHeaderSize() const {
|
|||||||
**************************************************************************/
|
**************************************************************************/
|
||||||
|
|
||||||
void PackHeader::putPackHeader(SPAN_S(byte) p) const {
|
void PackHeader::putPackHeader(SPAN_S(byte) p) const {
|
||||||
// NOTE: It is the caller's responsbility to ensure the buffer p has
|
// NOTE: It is the caller's responsibility to ensure the buffer p has
|
||||||
// sufficient space for the header.
|
// sufficient space for the header.
|
||||||
assert(get_le32(p) == UPX_MAGIC_LE32);
|
assert(get_le32(p) == UPX_MAGIC_LE32);
|
||||||
if (get_le32(p + 4) != UPX_MAGIC2_LE32) {
|
if (get_le32(p + 4) != UPX_MAGIC2_LE32) {
|
||||||
|
|||||||
+2
-2
@@ -49,8 +49,8 @@ struct PackHeader final {
|
|||||||
// enum { magic = UPX_MAGIC_LE32 };
|
// enum { magic = UPX_MAGIC_LE32 };
|
||||||
int version;
|
int version;
|
||||||
int format; // executable format UPX_F_xxx
|
int format; // executable format UPX_F_xxx
|
||||||
int method; // compresison method M_xxx
|
int method; // compression method M_xxx
|
||||||
int level; // compresison level 1..10
|
int level; // compression level 1..10
|
||||||
unsigned u_len;
|
unsigned u_len;
|
||||||
unsigned c_len;
|
unsigned c_len;
|
||||||
unsigned u_adler;
|
unsigned u_adler;
|
||||||
|
|||||||
@@ -63,7 +63,7 @@
|
|||||||
// and then followed by a comma to ignore the return value.
|
// and then followed by a comma to ignore the return value.
|
||||||
// The only complication is that percent and backslash
|
// The only complication is that percent and backslash
|
||||||
// must be doubled in the format string, because the format
|
// must be doubled in the format string, because the format
|
||||||
// string is processd twice: once at compile-time by 'asm'
|
// string is processed twice: once at compile-time by 'asm'
|
||||||
// to produce the assembled value, and once at runtime to use it.
|
// to produce the assembled value, and once at runtime to use it.
|
||||||
#if defined(__powerpc__) //{
|
#if defined(__powerpc__) //{
|
||||||
#define DPRINTF(fmt, args...) ({ \
|
#define DPRINTF(fmt, args...) ({ \
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ unsigned Pprotect(void *, size_t, unsigned);
|
|||||||
// and then followed by a comma to ignore the return value.
|
// and then followed by a comma to ignore the return value.
|
||||||
// The only complication is that percent and backslash
|
// The only complication is that percent and backslash
|
||||||
// must be doubled in the format string, because the format
|
// must be doubled in the format string, because the format
|
||||||
// string is processd twice: once at compile-time by 'asm'
|
// string is processed twice: once at compile-time by 'asm'
|
||||||
// to produce the assembled value, and once at runtime to use it.
|
// to produce the assembled value, and once at runtime to use it.
|
||||||
#if defined(__powerpc__) //{
|
#if defined(__powerpc__) //{
|
||||||
#define DPRINTF(fmt, args...) ({ \
|
#define DPRINTF(fmt, args...) ({ \
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ extern void f_int3(int arg);
|
|||||||
// and then followed by a comma to ignore the return value.
|
// and then followed by a comma to ignore the return value.
|
||||||
// The only complication is that percent and backslash
|
// The only complication is that percent and backslash
|
||||||
// must be doubled in the format string, because the format
|
// must be doubled in the format string, because the format
|
||||||
// string is processd twice: once at compile-time by 'asm'
|
// string is processed twice: once at compile-time by 'asm'
|
||||||
// to produce the assembled value, and once at runtime to use it.
|
// to produce the assembled value, and once at runtime to use it.
|
||||||
#if defined(__powerpc__) //{
|
#if defined(__powerpc__) //{
|
||||||
#define DPRINTF(fmt, args...) ({ \
|
#define DPRINTF(fmt, args...) ({ \
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ ssize_t write(int, void const *, size_t);
|
|||||||
// and then followed by a comma to ignore the return value.
|
// and then followed by a comma to ignore the return value.
|
||||||
// The only complication is that percent and backslash
|
// The only complication is that percent and backslash
|
||||||
// must be doubled in the format string, because the format
|
// must be doubled in the format string, because the format
|
||||||
// string is processd twice: once at compile-time by 'asm'
|
// string is processed twice: once at compile-time by 'asm'
|
||||||
// to produce the assembled value, and once at runtime to use it.
|
// to produce the assembled value, and once at runtime to use it.
|
||||||
#if defined(__powerpc__) //{
|
#if defined(__powerpc__) //{
|
||||||
#define DPRINTF(fmt, args...) ({ \
|
#define DPRINTF(fmt, args...) ({ \
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ ssize_t Pwrite(int, void const *, size_t);
|
|||||||
// and then followed by a comma to ignore the return value.
|
// and then followed by a comma to ignore the return value.
|
||||||
// The only complication is that percent and backslash
|
// The only complication is that percent and backslash
|
||||||
// must be doubled in the format string, because the format
|
// must be doubled in the format string, because the format
|
||||||
// string is processd twice: once at compile-time by 'asm'
|
// string is processed twice: once at compile-time by 'asm'
|
||||||
// to produce the assembled value, and once at runtime to use it.
|
// to produce the assembled value, and once at runtime to use it.
|
||||||
#if defined(__powerpc__) //{
|
#if defined(__powerpc__) //{
|
||||||
#define DPRINTF(fmt, args...) ({ \
|
#define DPRINTF(fmt, args...) ({ \
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ inline void xspan_mem_size_assert_ptrdiff(ptrdiff_t n) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if __cplusplus >= 201103L && 0
|
#if __cplusplus >= 201103L && 0
|
||||||
// unfortunately doesnt't work with some older versions of libstdc++
|
// unfortunately doesn't work with some older versions of libstdc++
|
||||||
// (TODO later: we now require C++17, so this now probably works on all supported platforms)
|
// (TODO later: we now require C++17, so this now probably works on all supported platforms)
|
||||||
template <class From, class To>
|
template <class From, class To>
|
||||||
struct XSpan_is_convertible : public std::is_convertible<From *, To *> {};
|
struct XSpan_is_convertible : public std::is_convertible<From *, To *> {};
|
||||||
|
|||||||
Reference in New Issue
Block a user