Make b-tree cache functions static.

[thirdparty/sarg.git] / readlog_sarg.c

diff --git a/readlog_sarg.c b/readlog_sarg.c
index 7a0b314384b8e75b8452df4bc237c5b8a961d591..c60ff285d0f1340b3cefddf778f0b44abf2a9988 100644 (file)
--- a/readlog_sarg.c
+++ b/readlog_sarg.c
@@ -1,6 +1,6 @@
 /*
  * SARG Squid Analysis Report Generator      http://sarg.sourceforge.net
- *                                                            1998, 2012
+ *                                                            1998, 2015
  *
  * SARG donations:
  *      please look at http://sarg.sourceforge.net/donations.php
@@ -26,6 +26,7 @@
 
 #include "include/conf.h"
 #include "include/defs.h"
+#include "include/readlog.h"
 
 //! \c True if the current log is known to be a sarg parsed log.
 static bool InSargLog=false;
@@ -66,10 +67,12 @@ static enum ReadLogReturnCodeEnum Sarg_ReadEntry(char *Line,struct ReadLogStruct
        int Hour;
        int Minute;
        int Second;
+       char *Ip;
+       char *User;
 
        if (strncmp(Line,"*** SARG Log ***",16)==0) {
                if (InvalidFileName) {
-                       debuga(_("The name of the file is invalid for a sarg log\n"));
+                       debuga(__FILE__,__LINE__,_("The name of the file is invalid for a sarg log\n"));
                        exit(EXIT_FAILURE);
                }
                getperiod_merge(&period,&SargPeriod);
@@ -117,12 +120,12 @@ static enum ReadLogReturnCodeEnum Sarg_ReadEntry(char *Line,struct ReadLogStruct
        Entry->EntryTime.tm_isdst=-1;
 
        // the ID of the user
-       Entry->User=++Line;
+       Entry->User=User=++Line;
        for (UserLen=0 ; *Line && *Line!='\t' ; UserLen++) Line++;
        if (*Line!='\t' || UserLen==0) return(RLRC_Unknown);
 
        // get IP address
-       Entry->Ip=++Line;
+       Entry->Ip=Ip=++Line;
        for (IpLen=0 ; *Line && *Line!='\t' ; IpLen++) Line++;
        if (*Line!='\t' || IpLen==0) return(RLRC_Unknown);
 
@@ -153,15 +156,15 @@ static enum ReadLogReturnCodeEnum Sarg_ReadEntry(char *Line,struct ReadLogStruct
 
        // check the entry time
        if (mktime(&Entry->EntryTime)==-1) {
-               debuga(_("Invalid date or time found in the common log file\n"));
+               debuga(__FILE__,__LINE__,_("Invalid date or time found in the common log file\n"));
                return(RLRC_InternalError);
        }
 
        // it is safe to alter the line buffer now that we are returning a valid entry
-       Entry->Ip[IpLen]='\0';
+       Ip[IpLen]='\0';
        Entry->HttpCode[HttpCodeLen]='\0';
        Entry->Url[UrlLen]='\0';
-       Entry->User[UserLen]='\0';
+       User[UserLen]='\0';
 
        return(RLRC_NoError);
 }