From 7e6a4cd48c2819d7fadf0ebc73e018252e6361da Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Sat, 28 May 2005 23:34:24 +0000
Subject: [PATCH] Remove two file that are not need any longer fix some
 compilings warings

svn path=/trunk/; revision=15646
---
 reactos/lib/cabinet/Makefile.in           | 19 -------------------
 reactos/lib/cabinet/Makefile.ros-template | 21 ---------------------
 reactos/lib/cabinet/cabextract.c          |  6 +++++-
 reactos/lib/cabinet/cabinet_main.c        |  3 ++-
 4 files changed, 7 insertions(+), 42 deletions(-)
 delete mode 100644 reactos/lib/cabinet/Makefile.in
 delete mode 100644 reactos/lib/cabinet/Makefile.ros-template

diff --git a/reactos/lib/cabinet/Makefile.in b/reactos/lib/cabinet/Makefile.in
deleted file mode 100644
index 9dbc9139d76..00000000000
--- a/reactos/lib/cabinet/Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = cabinet.dll
-IMPORTLIB = libcabinet.$(IMPLIBEXT)
-IMPORTS   = kernel32
-
-C_SRCS = \
-	cabextract.c \
-	cabinet_main.c \
-	fci.c \
-	fdi.c
-
-RC_SRCS = cabinet.rc
-
-@MAKE_DLL_RULES@
-
-### Dependencies:
diff --git a/reactos/lib/cabinet/Makefile.ros-template b/reactos/lib/cabinet/Makefile.ros-template
deleted file mode 100644
index a17f3164a6c..00000000000
--- a/reactos/lib/cabinet/Makefile.ros-template
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $
-
-TARGET_NAME = cabinet
-
-TARGET_OBJECTS = @C_SRCS@
-
-TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
-
-TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a
-
-TARGET_BASE = $(TARGET_BASE_LIB_CABINET)
-
-TARGET_RC_SRCS = @RC_SRCS@
-TARGET_RC_BINSRC = @RC_BINSRC@
-TARGET_RC_BINARIES = @RC_BINARIES@
-
-default: all
-
-DEP_OBJECTS = $(TARGET_OBJECTS)
-
-include $(TOOLS_PATH)/depend.mk
diff --git a/reactos/lib/cabinet/cabextract.c b/reactos/lib/cabinet/cabextract.c
index 4845c40bb65..3f3517d1c52 100644
--- a/reactos/lib/cabinet/cabextract.c
+++ b/reactos/lib/cabinet/cabextract.c
@@ -2523,9 +2523,13 @@ exit_handler:
  * print_fileinfo (internal)
  */
 void print_fileinfo(struct cab_file *fi) {
-  int d = fi->date, t = fi->time;
+  int d;
+  int t; 
   char *fname = NULL;
 
+  d = fi->date;
+  t = fi->time;
+
   if (fi->attribs & cffile_A_NAME_IS_UTF) {
     fname = malloc(strlen(fi->filename) + 1);
     if (fname) {
diff --git a/reactos/lib/cabinet/cabinet_main.c b/reactos/lib/cabinet/cabinet_main.c
index f5020ac7b3f..2959a6f075c 100644
--- a/reactos/lib/cabinet/cabinet_main.c
+++ b/reactos/lib/cabinet/cabinet_main.c
@@ -94,9 +94,10 @@ HRESULT WINAPI Extract(EXTRACTdest *dest, LPCSTR what)
 #define DUMPH(idx)      idx >= sizeof(EXTRACTdest) ? 0x55 : ptr[idx]
 
   LPSTR dir;
-  unsigned char *ptr = (unsigned char*) dest;
+  unsigned char *ptr;
   unsigned int i;
 
+   ptr = ((unsigned char*) dest);
   TRACE("(dest == %0lx, what == %s)\n", (long) dest, debugstr_a(what));
 
   if (!dest) {