cabinet/fdi.c: Fix compiler warning with flag -Wcast-qual

Mikhail Maroukhine mikolg at yandex.ru
Sat Mar 27 02:48:58 CDT 2010


field fdi_file.filename should not be declared as const pointer because in the code memory block is allocated to this field.
And owner of fdi_file struct is responsible to free that memory
---
 dlls/cabinet/fdi.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c
index de64f02..b68ab15 100644
--- a/dlls/cabinet/fdi.c
+++ b/dlls/cabinet/fdi.c
@@ -77,7 +77,7 @@ THOSE_ZIP_CONSTS;
 
 struct fdi_file {
   struct fdi_file *next;               /* next file in sequence          */
-  LPCSTR filename;                     /* output name of file            */
+  LPSTR filename;                     /* output name of file            */
   int    fh;                           /* open file handle or NULL       */
   cab_ULONG length;                    /* uncompressed length of file    */
   cab_ULONG offset;                    /* uncompressed offset in folder  */
@@ -2301,7 +2301,7 @@ static void free_decompression_mem(HFDI hfdi,
     }
     while (CAB(firstfile)) {
       file = CAB(firstfile);
-      if (file->filename) PFDI_FREE(hfdi, (void *)file->filename);
+      if (file->filename) PFDI_FREE(hfdi, file->filename);
       CAB(firstfile) = CAB(firstfile)->next;
       PFDI_FREE(hfdi, file);
     }
-- 
1.6.3.3


------------oZBzup7XltyAmhmLe7gbae--




More information about the wine-patches mailing list