[Libreoffice-commits] .: extensions/source

[Michael Stahl]

 extensions/source/macosx/spotlight/ioapi.m |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 24d913973798497d1d69f0d513f1016361e80f4d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jan 4 20:21:21 2012 +0100

    extensions: cast unused parameters to void
    
    Apparently omitting parameter names is not valid C.

diff --git a/extensions/source/macosx/spotlight/ioapi.m b/extensions/source/macosx/spotlight/ioapi.m
index 683eb97..331749c 100644
--- a/extensions/source/macosx/spotlight/ioapi.m
+++ b/extensions/source/macosx/spotlight/ioapi.m
@@ -94,10 +94,11 @@ int ZCALLBACK ferror_file_func OF((
 
 
 voidpf ZCALLBACK fopen_file_func(
-   voidpf /*opaque*/,
+   voidpf opaque,
    const char* filename,
    int mode)
 {
+    (void) opaque; // unused
     FILE* file = NULL;
     const char* mode_fopen = NULL;
     if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
@@ -116,11 +117,12 @@ voidpf ZCALLBACK fopen_file_func(
 
 
 uLong ZCALLBACK fread_file_func(
-   voidpf /*opaque*/,
+   voidpf opaque,
    voidpf stream,
    void* buf,
    uLong size)
 {
+    (void) opaque; // unused
     uLong ret;
     ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
@@ -128,31 +130,34 @@ uLong ZCALLBACK fread_file_func(
 
 
 uLong ZCALLBACK fwrite_file_func(
-   voidpf /*opaque*/,
+   voidpf opaque,
    voidpf stream,
    const void* buf,
    uLong size)
 {
+    (void) opaque; // unused
     uLong ret;
     ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
 }
 
 long ZCALLBACK ftell_file_func(
-   voidpf /*opaque*/,
+   voidpf opaque,
    voidpf stream)
 {
+    (void) opaque; // unused
     long ret;
     ret = ftell((FILE *)stream);
     return ret;
 }
 
 long ZCALLBACK fseek_file_func(
-   voidpf /*opaque*/,
+   voidpf opaque,
    voidpf stream,
    uLong offset,
    int origin)
 {
+    (void) opaque; // unused
     int fseek_origin=0;
     long ret;
     switch (origin)
@@ -174,18 +179,20 @@ long ZCALLBACK fseek_file_func(
 }
 
 int ZCALLBACK fclose_file_func(
-   voidpf /*opaque*/,
+   voidpf opaque,
    voidpf stream)
 {
+    (void) opaque; // unused
     int ret;
     ret = fclose((FILE *)stream);
     return ret;
 }
 
 int ZCALLBACK ferror_file_func(
-   voidpf /*opaque*/,
+   voidpf opaque,
    voidpf stream)
 {
+    (void) opaque; // unused
     int ret;
     ret = ferror((FILE *)stream);
     return ret;