From: Frederic Marchal <fmarchal@users.sourceforge.net>
Date: Sun, 26 Apr 2015 14:40:52 +0000 (+0200)
Subject: Minor message content adjustments.
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=79d6783da63d455c8109d1ff7a91fe0b80b732cd;p=thirdparty%2Fsarg.git

Minor message content adjustments.
---

diff --git a/html.c b/html.c
index 0c25b6a..4a2a39e 100644
--- 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';
diff --git a/report.c b/report.c
index 8636e87..56edff9 100644
--- 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);
 	}
 
diff --git a/siteuser.c b/siteuser.c
index cf0a073..5a052eb 100644
--- a/siteuser.c
+++ b/siteuser.c
@@ -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;
 	}
 
diff --git a/usertab.c b/usertab.c
index 4e0a580..ebcbb65 100644
--- 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;
 	}