]> git.ipfire.org Git - thirdparty/sarg.git/commitdiff
Minor message content adjustments.
authorFrederic Marchal <fmarchal@users.sourceforge.net>
Sun, 26 Apr 2015 14:40:52 +0000 (16:40 +0200)
committerFrederic Marchal <fmarchal@users.sourceforge.net>
Sun, 26 Apr 2015 14:40:52 +0000 (16:40 +0200)
html.c
report.c
siteuser.c
usertab.c

diff --git a/html.c b/html.c
index 0c25b6af1a0bd8c31c18fe4ad5a8d27059bdbc62..4a2a39e1ee064e8af13b398c77ea2432a7b3969f 100644 (file)
--- a/html.c
+++ b/html.c
@@ -264,7 +264,7 @@ void htmlrel(void)
                fputs("</tr></thead>\n",fp_ou);
 
                if(debug) {
-                       debuga(_("Making report: %s\n"),uinfo->id);
+                       debuga(_("Making report %s\n"),uinfo->id);
                }
                count=0;
                arqip[0]='\0';
index 8636e8788757dbcc829ef21eed93889ebb0adeaa..56edff97d0a218cba301023279572bf96466f147 100644 (file)
--- a/report.c
+++ b/report.c
@@ -446,7 +446,7 @@ static FILE *maketmp(const char *user, const char *dirname, int debug)
        if((ReportType & REPORT_TYPE_USERS_SITES) == 0) return(NULL);
        if((ReportType & REPORT_TYPE_TOPUSERS) == 0) return(NULL);
 
-       if(debug) debuga(_("Making file: %s/%s\n"),tmp,user);
+       if(debug) debuga(_("Making file %s/%s\n"),tmp,user);
        if (snprintf(wdirname,sizeof(wdirname),"%s/%s.utmp",tmp,user)>=sizeof(wdirname)) {
                debuga(_("Path too long: "));
                debuga_more("%s/%s.utmp\n",tmp,user);
@@ -528,7 +528,7 @@ static void gravager(FILE *fp_gen,const char *filename, const struct userinfostr
        to print a long long int unless it is exactly 64-bits long.
        */
        if (fprintf(fp_gen,"%s\t%"PRIu64"\t%"PRIu64"\t%s\t%s\t%s\t%s\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\n",uinfo->id,(uint64_t)nacc,(uint64_t)nbytes,url,ip,hora,dia,(uint64_t)nelap,(uint64_t)incache,(uint64_t)oucache)<0) {
-               debuga(_("Failed to write a line in %s\n"),filename);
+               debuga(_("Write error in file \"%s\": %s\n"),filename,strerror(errno));
                exit(EXIT_FAILURE);
        }
 
index cf0a073b5b9ffaa3026db1b9ad4544e14a9aa3f2..5a052ebb1c75bdf92a252bcb67d522e9a63170e8 100644 (file)
@@ -49,7 +49,7 @@ void siteuser(void)
        struct userinfostruct *uinfo;
 
        if(Privacy) {
-               if (debugz>=LogLevel_Process) debugaz(_("Sites and users report not generated because privacy option is on\n"));
+               if (debugz>=LogLevel_Process) debugaz(_("Sites & users report not generated because privacy option is on\n"));
                return;
        }
 
index 4e0a58084ad20ff5b75bcc09c57c8b93a774f8cc..ebcbb65360ff641619f8e651540d8385c5651490 100644 (file)
--- a/usertab.c
+++ b/usertab.c
@@ -313,8 +313,7 @@ static void get_ldap_name(const char *userlogin,char *mappedname,int namelen)
        attrs[1]=NULL;
        rc= ldap_search_ext_s(ldap_handle, LDAPBaseSearch, LDAP_SCOPE_SUBTREE, filtersearch, attrs, 0, NULL, NULL, NULL, -1, &result);
        if (rc != LDAP_SUCCESS) {
-               debuga(_("LDAP search failed: %s\n"), ldap_err2string(rc));
-               debuga(_("looking for \"%s\" at or below \"%s\"\n"),filtersearch,LDAPBaseSearch);
+               debuga(_("LDAP search failed: %s\nlooking for \"%s\" at or below \"%s\"\n"), ldap_err2string(rc),filtersearch,LDAPBaseSearch);
                safe_strcpy(mappedname,userlogin,namelen);
                return;
        }