Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed trailing whitespace.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2006-08-19 14:01:39 +02:00
parent 03ce7a8db3
commit 8b662bc6b5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_exc.cpp
+1 -1
View File
@@ -149,7 +149,7 @@ PackLinuxI386::generateElfHdr(
} }
if (ph.format==UPX_F_LINUX_i386 if (ph.format==UPX_F_LINUX_i386
|| ph.format==UPX_F_LINUX_SH_i386 || ph.format==UPX_F_LINUX_SH_i386
|| ph.format==UPX_F_BSD_i386 || ph.format==UPX_F_BSD_i386
) { ) {
// SELinux, PAx, grSecurity demand no PF_W if PF_X. // SELinux, PAx, grSecurity demand no PF_W if PF_X.
src/p_ps1.cpp
+4 -4
View File
@@ -189,13 +189,13 @@ void PackPs1::putBkupHeader(const unsigned char *src, unsigned char *dst, unsign
*len = ALIGN_UP(sz_cbh + sizeof(ps1_exe_chb_t) - 1, 4); *len = ALIGN_UP(sz_cbh + sizeof(ps1_exe_chb_t) - 1, 4);
p->ih_csum = ADLER16(upx_adler32(&ih.epc, SZ_IH_BKUP)); p->ih_csum = ADLER16(upx_adler32(&ih.epc, SZ_IH_BKUP));
memcpy(dst, cpr_bh, SZ_IH_BKUP); memcpy(dst, cpr_bh, SZ_IH_BKUP);
delete [] cpr_bh; delete [] cpr_bh;
} }
else else
throwInternalError("failed to create backup header"); throwInternalError("failed to create backup header");
} }
#define ADLER16_HI(a,b) ((((a) & 0xffff) ^ (b)) << 16) #define ADLER16_HI(a,b) ((((a) & 0xffff) ^ (b)) << 16)
#define ADLER16_LO(a,b) (((a) >> 16) ^ (b)) #define ADLER16_LO(a,b) (((a) >> 16) ^ (b))
#define RE_ADLER16(a,b) (ADLER16_HI(a,b) | ADLER16_LO(a,b)) #define RE_ADLER16(a,b) (ADLER16_HI(a,b) | ADLER16_LO(a,b))
@@ -206,7 +206,7 @@ bool PackPs1::getBkupHeader(unsigned char *p, unsigned char *dst)
if (src && src->id == '1' && dst) if (src && src->id == '1' && dst)
{ {
unsigned char *unc_bh = new unsigned char[MemBuffer::getSizeForUncompression(SZ_IH_BKUP)]; unsigned char *unc_bh = new unsigned char[MemBuffer::getSizeForUncompression(SZ_IH_BKUP)];
unsigned sz_bh = SZ_IH_BKUP; unsigned sz_bh = SZ_IH_BKUP;
int r = upx_decompress((const unsigned char *)&src->ih_bkup, src->len, int r = upx_decompress((const unsigned char *)&src->ih_bkup, src->len,
unc_bh, &sz_bh, M_NRV2E_8, NULL ); unc_bh, &sz_bh, M_NRV2E_8, NULL );
@@ -465,7 +465,7 @@ void PackPs1::pack(OutputFile *fo)
} }
memcpy(&oh, &ih, sizeof(ih)); memcpy(&oh, &ih, sizeof(ih));
unsigned sz_cbh; unsigned sz_cbh;
putBkupHeader((const unsigned char *)&ih.epc, (unsigned char *)&bh, &sz_cbh); putBkupHeader((const unsigned char *)&ih.epc, (unsigned char *)&bh, &sz_cbh);