From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Sat, 18 Sep 2010 12:31:05 +0000 (+0000)
Subject: Remove the distinct printf for the alpha architecture
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47079d93fa0dacbb71e2e642f5f649b9c1a791d2;p=thirdparty%2Fsarg.git

Remove the distinct printf for the alpha architecture
---

diff --git a/ChangeLog b/ChangeLog
index 99ac521..67f0c05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 SARG ChangeLog
 
-Jun-21-2009 Version 2.3
+Jul-12-2010 Version 2.3.1
+		- Remove the distinct printf for the alpha architecture as it doesn't work anymore and is not necessary anyway.
+
+Jun-10-2010 Version 2.3
 		- LDAP usertab added. 
 		  Now you can have your users in a LDAP Server.
 		  Use these tags in sarg.conf: LDAPHost, LDAPPort, LDAPBindDN, LDAPBindPW,
diff --git a/email.c b/email.c
index 6e54850..63a77f3 100644
--- a/email.c
+++ b/email.c
@@ -80,8 +80,6 @@ int geramail(const char *dirname, int debug, const char *outdir, const char *ema
          if (olduser[0] != '\0') {
 #if defined(__FreeBSD__)
             fprintf(fp_top2,"%s\t%qu\t%qu\t%qu\n",olduser,tnbytes,tnacc,tnelap);
-#elif defined(__alpha) || __ALPHA
-            fprintf(fp_top2,"%s\t%ld\t%ld\t%ld\n",olduser,tnbytes,tnacc,tnelap);
 #else
             fprintf(fp_top2,"%s\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\n",olduser,(uint64_t)tnbytes,(uint64_t)tnacc,(uint64_t)tnelap);
 #endif
@@ -103,8 +101,6 @@ int geramail(const char *dirname, int debug, const char *outdir, const char *ema
    if (olduser[0] != '\0') {
 #if defined(__FreeBSD__)
       fprintf(fp_top2,"%s\t%qu\t%qu\t%qu\n",olduser,tnbytes,tnacc,tnelap);
-#elif defined(__alpha) || __ALPHA
-      fprintf(fp_top2,"%s\t%ld\t%ld\t%ld\n",olduser,tnbytes,tnacc,tnelap);
 #else
       fprintf(fp_top2,"%s\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\n",olduser,(uint64_t)tnbytes,(uint64_t)tnacc,(uint64_t)tnelap);
 #endif
@@ -132,8 +128,6 @@ int geramail(const char *dirname, int debug, const char *outdir, const char *ema
    }
 #if defined(__FreeBSD__)
    fprintf(fp_top1,"TOTAL\t%qu\t%qu\t%qu\n",ttnbytes,ttnacc,ttnelap);
-#elif defined(__alpha) || __ALPHA
-   fprintf(fp_top1,"TOTAL\t%ld\t%ld\t%ld\n",ttnbytes,ttnacc,ttnelap);
 #else
    fprintf(fp_top1,"TOTAL\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\n",(uint64_t)ttnbytes,(uint64_t)ttnacc,(uint64_t)ttnelap);
 #endif
@@ -208,16 +202,12 @@ int geramail(const char *dirname, int debug, const char *outdir, const char *ema
          fputs("------- -------------------- -------- --------------- ------- ---------- ---------- -------\n",fp_top3);
 #if defined(__FreeBSD__)
          fprintf(fp_top3,"%-7s %20s %8qu %15s %8s %9s %10qu\n",_("TOTAL")," ",ttnacc,fixnum(ttnbytes,1)," ",buildtime(ttnelap),ttnelap);
-#elif defined(__alpha) || __ALPHA
-         fprintf(fp_top3,"%-7s %20s %8ld %15s %8s %9s %10ld\n",_("TOTAL")," ",ttnacc,fixnum(ttnbytes,1)," ",buildtime(ttnelap),ttnelap);
 #else
          fprintf(fp_top3,"%-7s %20s %8"PRIu64" %15s %8s %9s %10"PRIu64"\n",_("TOTAL")," ",(uint64_t)ttnacc,fixnum(ttnbytes,1)," ",buildtime(ttnelap),(uint64_t)ttnelap);
 #endif
       } else {
 #if defined(__FreeBSD__)
          fprintf(fp_top3,"%7d %20s %8lld %15s %3.2lf%% %10s %10qu %3.2lf%%\n",posicao,user,nacc,fixnum(nbytes,1),perc,buildtime(elap),elap,perc2);
-#elif defined(__alpha) || __ALPHA
-         fprintf(fp_top3,"%7d %20s %8lld %15s %3.2lf%% %10s %10ld %3.2lf%%\n",posicao,user,nacc,fixnum(nbytes,1),perc,buildtime(elap),elap,perc2);
 #else
          fprintf(fp_top3,"%7d %20s %8"PRIu64" %15s %3.2lf%% %10s %10"PRIu64" %3.2lf%%\n",posicao,user,(uint64_t)nacc,fixnum(nbytes,1),perc,buildtime(elap),(uint64_t)elap,perc2);
 #endif
@@ -238,8 +228,6 @@ int geramail(const char *dirname, int debug, const char *outdir, const char *ema
    strip_latin(strip1);
 #if defined(__FreeBSD__)
    fprintf(fp_top3,"%-7s %20s %8qu %15s %8s %9s %10qu\n",strip1," ",avgacc,fixnum(tnbytes,1)," ",buildtime(avgelap),avgelap);
-#elif defined(__alpha) || __ALPHA
-   fprintf(fp_top3,"%-7s %20s %8ld %15s %8s %9s %10ld\n",strip1," ",avgacc,fixnum(tnbytes,1)," ",buildtime(avgelap),avgelap);
 #else
    fprintf(fp_top3,"%-7s %20s %8"PRIu64" %15s %8s %9s %10"PRIu64"\n",strip1," ",(uint64_t)avgacc,fixnum(tnbytes,1)," ",buildtime(avgelap),(uint64_t)avgelap);
 #endif
diff --git a/include/info.h b/include/info.h
index 6bd4ba7..744af77 100755
--- a/include/info.h
+++ b/include/info.h
@@ -1,3 +1,3 @@
-#define VERSION PACKAGE_VERSION" Jun-21-2010"
+#define VERSION PACKAGE_VERSION" Jul-12-2010"
 #define PGM PACKAGE_NAME
 #define URL "http://sarg.sourceforge.net"