From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Wed, 23 Sep 2009 06:50:45 +0000 (+0000)
Subject: Removed missplaced off_t as suggested in bug #2864425.
X-Git-Tag: v2_2_6~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddd6ce0194cf405d625b8363fe9be786dad67b95;p=thirdparty%2Fsarg.git

Removed missplaced off_t as suggested in bug #2864425.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cef9498..5b2b3e3 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(sarg C)
 SET(sarg_VERSION 2)
 SET(sarg_REVISION 2)
 SET(sarg_BUILD "6rc1")
-SET(sarg_BUILDDATE "Sep-22-2009")
+SET(sarg_BUILDDATE "Sep-23-2009")
 
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFile)
diff --git a/ChangeLog b/ChangeLog
index 7bfc057..fa2164f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 SARG ChangeLog
 
-Sep-22-2009 Version 2.2.6rc1
+Sep-23-2009 Version 2.2.6rc1
 		- Protection against buffer overflows in getword and friends and report the origin of the error instead of always blaming access.log.
 		- Patch #2224623 applied.
 		- Updated to autoconf 2.61.
@@ -65,6 +65,7 @@ Sep-22-2009 Version 2.2.6rc1
 		- Compute the report date without resorting to the system command.
 		- Allow the use of spaces in the temporary directory.
 		- Fixed bug #2863485.
+		- Removed missplaced off_t as suggested in bug #2864425.
 
 Mar-03-2008	Version 2.2.5
 		- new fix to the script insertion vulnerability via user-agent
diff --git a/include/info.h b/include/info.h
index 7eff6ee..03b16a6 100755
--- a/include/info.h
+++ b/include/info.h
@@ -1,3 +1,3 @@
-#define VERSION PACKAGE_VERSION" Sep-22-2009"
+#define VERSION PACKAGE_VERSION" Sep-23-2009"
 #define PGM PACKAGE_NAME
 #define URL "http://sarg.sourceforge.net"
diff --git a/log.c b/log.c
index d874e21..d21adcb 100644
--- a/log.c
+++ b/log.c
@@ -1571,14 +1571,14 @@ static void getusers(const char *pwdfile, int debug)
       exit(1);
    }
 
-   fseek(fp_usr, (off_t)0, SEEK_END);
+   fseek(fp_usr, 0, SEEK_END);
    nreg = ftell(fp_usr);
    if (nreg<0) {
       printf("SARG: Cannot get the size of file %s",pwdfile);
       exit(1);
    }
    nreg = nreg+5000;
-   fseek(fp_usr, (off_t)0, SEEK_SET);
+   fseek(fp_usr, 0, SEEK_SET);
 
    if((userfile=(char *) malloc(nreg))==NULL){
       fprintf(stderr, "SARG: %s (%ld):\n",text[59],nreg);
@@ -1619,14 +1619,14 @@ static void gethexclude(const char *hexfile, int debug)
       exit(1);
    }
 
-   fseek(fp_ex, (off_t)0, SEEK_END);
+   fseek(fp_ex, 0, SEEK_END);
    nreg = ftell(fp_ex);
    if (nreg<0) {
       printf("SARG: Cannot get the size of file %s",hexfile);
       exit(1);
    }
    nreg += 11;
-   fseek(fp_ex, (off_t)0, SEEK_SET);
+   fseek(fp_ex, 0, SEEK_SET);
 
    if((excludefile=(char *) malloc(nreg))==NULL){
       fprintf(stderr, "SARG: %s (%ld):\n",text[59],nreg);
@@ -1666,14 +1666,14 @@ static void getuexclude(const char *uexfile, int debug)
       exit(1);
    }
 
-   fseek(fp_ex, (off_t)0, SEEK_END);
+   fseek(fp_ex, 0, SEEK_END);
    nreg = ftell(fp_ex);
    if (nreg<0) {
       printf("SARG: Cannot get the size of file %s",uexfile);
       exit(1);
    }
    nreg += 11;
-   fseek(fp_ex, (off_t)0, SEEK_SET);
+   fseek(fp_ex, 0, SEEK_SET);
 
    if((excludeuser=(char *) malloc(nreg))==NULL){
       fprintf(stderr, "SARG: %s (%ld):\n",text[59],nreg);