From 4dbcbae5d91ca5217084a02e45d7cae9c82ac9ae Mon Sep 17 00:00:00 2001 From: Thomas Weidenmueller Date: Tue, 7 Jun 2005 20:06:39 +0000 Subject: [PATCH] Removed local variables only used in TRACE statements. --- dlls/cabinet/cabextract.c | 6 +++--- dlls/cabinet/cabinet_main.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/cabinet/cabextract.c b/dlls/cabinet/cabextract.c index f7bcaa2f8f0..bcbc2b6185c 100644 --- a/dlls/cabinet/cabextract.c +++ b/dlls/cabinet/cabextract.c @@ -31,6 +31,7 @@ #include #include #include +#include #include "windef.h" #include "winbase.h" @@ -2523,7 +2524,6 @@ exit_handler: * print_fileinfo (internal) */ void print_fileinfo(struct cab_file *fi) { - int d = fi->date, t = fi->time; char *fname = NULL; if (fi->attribs & cffile_A_NAME_IS_UTF) { @@ -2536,8 +2536,8 @@ void print_fileinfo(struct cab_file *fi) { TRACE("%9u | %02d.%02d.%04d %02d:%02d:%02d | %s\n", fi->length, - d & 0x1f, (d>>5) & 0xf, (d>>9) + 1980, - t >> 11, (t>>5) & 0x3f, (t << 1) & 0x3e, + fi->date & 0x1f, (fi->date>>5) & 0xf, (fi->date>>9) + 1980, + fi->time >> 11, (fi->time>>5) & 0x3f, (fi->time << 1) & 0x3e, fname ? fname : fi->filename ); diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 81ebb5e7462..cd92357ba0d 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -89,12 +89,12 @@ HRESULT WINAPI CABINET_DllGetVersion (DLLVERSIONINFO *pdvi) HRESULT WINAPI Extract(EXTRACTdest *dest, LPCSTR what) { #define DUMPC(idx) idx >= sizeof(EXTRACTdest) ? ' ' : \ - ptr[idx] >= 0x20 ? ptr[idx] : '.' + ((unsigned char*) dest)[idx] >= 0x20 ? \ + ((unsigned char*) dest)[idx] : '.' -#define DUMPH(idx) idx >= sizeof(EXTRACTdest) ? 0x55 : ptr[idx] +#define DUMPH(idx) idx >= sizeof(EXTRACTdest) ? 0x55 : ((unsigned char*) dest)[idx] LPSTR dir; - unsigned char *ptr = (unsigned char*) dest; unsigned int i; TRACE("(dest == %0lx, what == %s)\n", (long) dest, debugstr_a(what));