From 5b2d6488a2104bee42edd37d29eddf83446004a3 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Mon, 29 Dec 2008 22:22:28 +0100 Subject: [PATCH] Silence some compilation warnings. --- src/p_vmlinz.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/p_vmlinz.cpp b/src/p_vmlinz.cpp index 9bb5dea4..f79d8e47 100644 --- a/src/p_vmlinz.cpp +++ b/src/p_vmlinz.cpp @@ -306,7 +306,7 @@ int PackVmlinuzI386::decompressKernel() unsigned delta_off = 0; for (unsigned j=0; j < ehdr->e_phnum; ++j, ++phdr) { if (phdr->PT_LOAD==phdr->p_type) { - unsigned step = (-1+ phdr->p_align + hi_paddr) & ~(-1+ phdr->p_align); + unsigned step = (hi_paddr + phdr->p_align - 1) & ~(phdr->p_align - 1); if (0==hi_paddr) { // first PT_LOAD if (physical_start!=phdr->p_paddr) { return 0; @@ -776,11 +776,11 @@ int PackVmlinuzARMEL::decompressKernel() if (j!=get_te32(j + obuf)) { continue; } - if (0xea000000!=(0xff000000& get_te32(-4+ j + obuf)) - || 0xeb000000!=(0xff000000&(w= get_te32(-8+ j + obuf))) ) { + if (0xea000000!=(0xff000000& get_te32(j - 4 + obuf)) + || 0xeb000000!=(0xff000000&(w= get_te32(j - 8 + obuf))) ) { continue; } - caller1 = -8 + j; + caller1 = j - 8; decompress_kernel = ((0x00ffffff & w)<<2) + 8+ caller1; for (unsigned k = 12; k<=128; k+=4) { w = get_te32(j - k + obuf);