You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/03/01 02:35:41 UTC
[lucy-commits] svn commit: r1075611 - in /incubator/lucy/trunk:
charmonizer/src/Charmonizer/Core/Util.c
charmonizer/src/Charmonizer/Core/Util.h clownfish/src/CFCUtil.c
clownfish/src/CFCUtil.h
Author: marvin
Date: Tue Mar 1 01:35:41 2011
New Revision: 1075611
URL: http://svn.apache.org/viewvc?rev=1075611&view=rev
Log:
Change the type of argument to Util_flength so that it is no longer necessary
to include <stdio.h>.
Modified:
incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.h
incubator/lucy/trunk/clownfish/src/CFCUtil.c
incubator/lucy/trunk/clownfish/src/CFCUtil.h
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.c?rev=1075611&r1=1075610&r2=1075611&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.c Tue Mar 1 01:35:41 2011
@@ -85,8 +85,9 @@ Util_slurp_file(const char *file_path, s
}
long
-Util_flength(FILE *f)
+Util_flength(void *file)
{
+ FILE *f = (FILE*)file;
const long bookmark = ftell(f);
long check_val;
long len;
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.h?rev=1075611&r1=1075610&r2=1075611&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.h (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.h Tue Mar 1 01:35:41 2011
@@ -49,7 +49,7 @@ chaz_Util_strdup(const char *string);
/* Get the length of a file (may overshoot on text files under DOS).
*/
long
-chaz_Util_flength(FILE *f);
+chaz_Util_flength(void *file);
/* Print an error message to stderr and exit.
*/
Modified: incubator/lucy/trunk/clownfish/src/CFCUtil.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCUtil.c?rev=1075611&r1=1075610&r2=1075611&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCUtil.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCUtil.c Tue Mar 1 01:35:41 2011
@@ -210,8 +210,9 @@ Util_slurp_file(const char *file_path, s
}
long
-Util_flength(FILE *f)
+Util_flength(void *file)
{
+ FILE *f = (FILE*)file;
const long bookmark = ftell(f);
long check_val;
long len;
Modified: incubator/lucy/trunk/clownfish/src/CFCUtil.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCUtil.h?rev=1075611&r1=1075610&r2=1075611&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCUtil.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCUtil.h Tue Mar 1 01:35:41 2011
@@ -17,8 +17,6 @@
#ifndef H_CFCUTIL
#define H_CFCUTIL
-#include <stdio.h>
-
/** Create an inner Perl object with a refcount of 1. For use in actual
* Perl-space, it is necessary to wrap this inner object in an RV.
*/
@@ -95,7 +93,7 @@ chaz_Util_slurp_file(const char *file_pa
/* Get the length of a file (may overshoot on text files under DOS).
*/
long
-chaz_Util_flength(FILE *f);
+chaz_Util_flength(void *file);
/* Print an error message to stderr and exit.
*/