diff -Nru libmspack-0.0.20040308alpha.orig/mspack/mspack.h libmspack-0.0.20040308alpha/mspack/mspack.h
--- libmspack-0.0.20040308alpha.orig/mspack/mspack.h	2005-05-11 15:05:15.000000000 +0200
+++ libmspack-0.0.20040308alpha/mspack/mspack.h	2005-05-11 15:05:56.000000000 +0200
@@ -260,7 +260,7 @@
    *         for other mspack_system methods to operate.
    * @see close(), read(), write(), seek(), tell(), message()
    */
-  struct mspack_file * (*open)(struct mspack_system *this,
+  struct mspack_file * (*open)(struct mspack_system *,
 			       char *filename,
 			       int mode);
 
@@ -369,7 +369,7 @@
    *         not enough memory is available
    * @see free()
    */
-  void * (*alloc)(struct mspack_system *this,
+  void * (*alloc)(struct mspack_system *,
 		  size_t bytes);
   
   /**
@@ -476,12 +476,12 @@
 /** Destroys an existing CAB compressor.
  * @param this the #mscab_compressor to destroy
  */
-extern void mspack_destroy_cab_compressor(struct mscab_compressor *this);
+extern void mspack_destroy_cab_compressor(struct mscab_compressor *);
 
 /** Destroys an existing CAB decompressor.
  * @param this the #mscab_decompressor to destroy
  */
-extern void mspack_destroy_cab_decompressor(struct mscab_decompressor *this);
+extern void mspack_destroy_cab_decompressor(struct mscab_decompressor *);
 
 
 /** Creates a new CHM compressor.
@@ -501,12 +501,12 @@
 /** Destroys an existing CHM compressor.
  * @param this the #mschm_compressor to destroy
  */
-extern void mspack_destroy_chm_compressor(struct mschm_compressor *this);
+extern void mspack_destroy_chm_compressor(struct mschm_compressor *);
 
 /** Destroys an existing CHM decompressor.
  * @param this the #mschm_decompressor to destroy
  */
-extern void mspack_destroy_chm_decompressor(struct mschm_decompressor *this);
+extern void mspack_destroy_chm_decompressor(struct mschm_decompressor *);
 
 
 /** Creates a new LIT compressor.
@@ -526,12 +526,12 @@
 /** Destroys an existing LIT compressor.
  * @param this the #mslit_compressor to destroy
  */
-extern void mspack_destroy_lit_compressor(struct mslit_compressor *this);
+extern void mspack_destroy_lit_compressor(struct mslit_compressor *);
 
 /** Destroys an existing LIT decompressor.
  * @param this the #mslit_decompressor to destroy
  */
-extern void mspack_destroy_lit_decompressor(struct mslit_decompressor *this);
+extern void mspack_destroy_lit_decompressor(struct mslit_decompressor *);
 
 
 /** Creates a new HLP compressor.
@@ -551,12 +551,12 @@
 /** Destroys an existing hlp compressor.
  * @param this the #mshlp_compressor to destroy
  */
-extern void mspack_destroy_hlp_compressor(struct mshlp_compressor *this);
+extern void mspack_destroy_hlp_compressor(struct mshlp_compressor *);
 
 /** Destroys an existing hlp decompressor.
  * @param this the #mshlp_decompressor to destroy
  */
-extern void mspack_destroy_hlp_decompressor(struct mshlp_decompressor *this);
+extern void mspack_destroy_hlp_decompressor(struct mshlp_decompressor *);
 
 
 /** Creates a new SZDD compressor.
@@ -576,12 +576,12 @@
 /** Destroys an existing SZDD compressor.
  * @param this the #msszdd_compressor to destroy
  */
-extern void mspack_destroy_szdd_compressor(struct msszdd_compressor *this);
+extern void mspack_destroy_szdd_compressor(struct msszdd_compressor *);
 
 /** Destroys an existing SZDD decompressor.
  * @param this the #msszdd_decompressor to destroy
  */
-extern void mspack_destroy_szdd_decompressor(struct msszdd_decompressor *this);
+extern void mspack_destroy_szdd_decompressor(struct msszdd_decompressor *);
 
 
 /** Creates a new KWAJ compressor.
@@ -601,12 +601,12 @@
 /** Destroys an existing KWAJ compressor.
  * @param this the #mskwaj_compressor to destroy
  */
-extern void mspack_destroy_kwaj_compressor(struct mskwaj_compressor *this);
+extern void mspack_destroy_kwaj_compressor(struct mskwaj_compressor *);
 
 /** Destroys an existing KWAJ decompressor.
  * @param this the #mskwaj_decompressor to destroy
  */
-extern void mspack_destroy_kwaj_decompressor(struct mskwaj_decompressor *this);
+extern void mspack_destroy_kwaj_decompressor(struct mskwaj_decompressor *);
 
 
 /* --- support for .CAB (MS Cabinet) file format --------------------------- */
@@ -894,7 +894,7 @@
    * @return a pointer to a mscabd_cabinet structure, or NULL on failure
    * @see close(), search(), last_error()
    */
-  struct mscabd_cabinet * (*open) (struct mscab_decompressor *this,
+  struct mscabd_cabinet * (*open) (struct mscab_decompressor *,
 				   char *filename);
 
   /**
@@ -926,7 +926,7 @@
    * @param  cab      the cabinet to close
    * @see open(), search(), append(), prepend()
    */
-  void (*close)(struct mscab_decompressor *this,
+  void (*close)(struct mscab_decompressor *,
 		struct mscabd_cabinet *cab);
 
   /**
@@ -963,7 +963,7 @@
    * @return a pointer to a mscabd_cabinet structure, or NULL
    * @see close(), open(), last_error()
    */
-  struct mscabd_cabinet * (*search) (struct mscab_decompressor *this,
+  struct mscabd_cabinet * (*search) (struct mscab_decompressor *,
 				     char *filename);
 
   /**
@@ -1006,7 +1006,7 @@
    * @return an error code, or MSPACK_ERR_OK if successful
    * @see prepend(), open(), close()
    */
-  int (*append) (struct mscab_decompressor *this,
+  int (*append) (struct mscab_decompressor *,
 		 struct mscabd_cabinet *cab,
 		 struct mscabd_cabinet *nextcab);
 
@@ -1028,7 +1028,7 @@
    * @return an error code, or MSPACK_ERR_OK if successful
    * @see append(), open(), close()
    */
-  int (*prepend) (struct mscab_decompressor *this,
+  int (*prepend) (struct mscab_decompressor *,
 		  struct mscabd_cabinet *cab,
 		  struct mscabd_cabinet *prevcab);
 
@@ -1054,7 +1054,7 @@
    * @param  filename the filename of the file being written to
    * @return an error code, or MSPACK_ERR_OK if successful
    */
-  int (*extract)(struct mscab_decompressor *this,
+  int (*extract)(struct mscab_decompressor *,
 		 struct mscabd_file *file,
 		 char *filename);
 
@@ -1080,7 +1080,7 @@
    *         is a problem with either parameter or value.
    * @see search(), extract()
    */
-  int (*set_param)(struct mscab_decompressor *this,
+  int (*set_param)(struct mscab_decompressor *,
 		   int param,
 		   int value);
 
@@ -1294,7 +1294,7 @@
    * @return a pointer to a mschmd_header structure, or NULL on failure
    * @see close()
    */
-  struct mschmd_header *(*open)(struct mschm_decompressor *this,
+  struct mschmd_header *(*open)(struct mschm_decompressor *,
 				char *filename);
 
   /**
@@ -1314,7 +1314,7 @@
    * @param  chm      the CHM helpfile to close
    * @see open(), fast_open()
    */
-  void (*close)(struct mschm_decompressor *this,
+  void (*close)(struct mschm_decompressor *,
 		struct mschmd_header *chm);
 
   /**
@@ -1335,7 +1335,7 @@
    * @param  filename the filename of the file being written to
    * @return an error code, or MSPACK_ERR_OK if successful
    */
-  int (*extract)(struct mschm_decompressor *this,
+  int (*extract)(struct mschm_decompressor *,
 		 struct mschmd_file *file,
 		 char *filename);
 
@@ -1350,7 +1350,7 @@
    * @return the most recent error code
    * @see open(), search()
    */
-  int (*last_error)(struct mschm_decompressor *this);
+  int (*last_error)(struct mschm_decompressor *);
 
   /**
    * Opens a CHM helpfile quickly.
@@ -1374,7 +1374,7 @@
    * @return a pointer to a mschmd_header structure, or NULL on failure
    * @see open(), close(), fast_find(), extract()
    */
-  struct mschmd_header *(*fast_open)(struct mschm_decompressor *this,
+  struct mschmd_header *(*fast_open)(struct mschm_decompressor *,
 				     char *filename);
 
   /**
@@ -1415,7 +1415,7 @@
    * @return MSPACK_ERR_OK, or an error code
    * @see open(), close(), fast_find(), extract()
    */
-  int (*fast_find)(struct mschm_decompressor *this,
+  int (*fast_find)(struct mschm_decompressor *,
 		   struct mschmd_header *chm,
 		   char *filename,
 		   struct mschmd_file *f_ptr,