Merge the messages about invalid data

[thirdparty/sarg.git] / convlog.c

diff --git a/convlog.c b/convlog.c
index bbbfe44c05e90846801f7d551c22f921d8d01d40..f906772d6f60ff114e543629fc0f6898c2da3603 100644 (file)
--- a/convlog.c
+++ b/convlog.c
@@ -1,6 +1,6 @@
 /*
  * SARG Squid Analysis Report Generator      http://sarg.sourceforge.net
- *                                                            1998, 2013
+ *                                                            1998, 2015
  *
  * SARG donations:
  *      please look at http://sarg.sourceforge.net/donations.php
@@ -55,7 +55,7 @@ void convlog(const char *arq, char df, int dfrom, int duntil)
        while((buf=longline_read(fp_in,line))!=NULL) {
                getword_start(&gwarea,buf);
                if (getword(data,sizeof(data),&gwarea,' ')<0) {
-                       debuga(_("Maybe you have a broken record or garbage in file %s\n"),arq);
+                       debuga(_("Invalid record in file \"%s\"\n"),arq);
                        exit(EXIT_FAILURE);
                }
                tt=atoi(data);
@@ -79,7 +79,7 @@ void convlog(const char *arq, char df, int dfrom, int duntil)
 
        longline_destroy(&line);
        if (fclose(fp_in)==EOF) {
-               debuga(_("Failed to close file %s: %s\n"),arq,strerror(errno));
+               debuga(_("Read error in \"%s\": %s\n"),arq,strerror(errno));
                exit(EXIT_FAILURE);
        }
 }