[axel-commits] r46 - in /branches/2.x: CHANGES axel.h text.c

[appaji-guest at users.alioth.debian.org]

Author: appaji-guest
Date: Mon Sep 15 07:39:38 2008
New Revision: 46

URL: http://svn.debian.org/wsvn/axel/?sc=1&rev=46
Log:
Merge fixes on trunk intended for 2.1

Modified:
    branches/2.x/CHANGES
    branches/2.x/axel.h
    branches/2.x/text.c

Modified: branches/2.x/CHANGES
URL: http://svn.debian.org/wsvn/axel/branches/2.x/CHANGES?rev=46&op=diff
==============================================================================
--- branches/2.x/CHANGES (original)
+++ branches/2.x/CHANGES Mon Sep 15 07:39:38 2008
@@ -1,3 +1,8 @@
+Version 2.1:
+
+- Fix version string.  2.0 still reported 1.1, thanks Ajay R Ramjatan
+- Fix new MB/s display (was showing B/s).  Thanks Philipp Hagemeister
+
 Version 2.0:
 
 - Large file support thanks thanks David Turnbull

Modified: branches/2.x/axel.h
URL: http://svn.debian.org/wsvn/axel/branches/2.x/axel.h?rev=46&op=diff
==============================================================================
--- branches/2.x/axel.h (original)
+++ branches/2.x/axel.h Mon Sep 15 07:39:38 2008
@@ -67,7 +67,7 @@
 #define MAX_STRING		1024
 #define MAX_ADD_HEADERS	10
 #define MAX_REDIR		5
-#define AXEL_VERSION_STRING	"1.1"
+#define AXEL_VERSION_STRING	"2.1"
 #define USER_AGENT		"Axel " AXEL_VERSION_STRING " (" ARCH ")"
 
 typedef struct

Modified: branches/2.x/text.c
URL: http://svn.debian.org/wsvn/axel/branches/2.x/text.c?rev=46&op=diff
==============================================================================
--- branches/2.x/text.c (original)
+++ branches/2.x/text.c Mon Sep 15 07:39:38 2008
@@ -494,7 +494,7 @@
 	}
 	
 	if(axel->bytes_per_second > 1048576)
-		printf( "] [%6.1fMB/s]", (double) axel->bytes_per_second / 1024*1024 );
+		printf( "] [%6.1fMB/s]", (double) axel->bytes_per_second / (1024*1024) );
 	else if(axel->bytes_per_second > 1024)
 		printf( "] [%6.1fKB/s]", (double) axel->bytes_per_second / 1024 );
 	else