bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use double rather than float everywhere

Browse source 
No real need to use the smaller floating point types here.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-01-10 08:44:23 -06:00
parent 5f140a62de
commit 3e1bdfa93c
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/pacman/callback.c
View file

@ -36,7 +36,7 @@
#include "conf.h" #include "conf.h"
/* download progress bar */ /* download progress bar */
static float rate_last; static double rate_last;
static off_t xfered_last; static off_t xfered_last;
static off_t list_xfered = 0.0; static off_t list_xfered = 0.0;
static off_t list_total = 0.0; static off_t list_total = 0.0;
@ -55,9 +55,9 @@ static alpm_list_t *output = NULL;
* *
* first_call indicates if this is the first time it is called, for * first_call indicates if this is the first time it is called, for
* initialization purposes */ * initialization purposes */
static float get_update_timediff(int first_call) static double get_update_timediff(int first_call)
{ {
float retval = 0.0; double retval = 0.0;
static struct timeval last_time = {0, 0}; static struct timeval last_time = {0, 0};
/* on first call, simply set the last time and return */ /* on first call, simply set the last time and return */
@ -65,7 +65,7 @@ static float get_update_timediff(int first_call)
gettimeofday(&last_time, NULL); gettimeofday(&last_time, NULL);
} else { } else {
struct timeval this_time; struct timeval this_time;
float diff_sec, diff_usec; double diff_sec, diff_usec;
gettimeofday(&this_time, NULL); gettimeofday(&this_time, NULL);
diff_sec = this_time.tv_sec - last_time.tv_sec; diff_sec = this_time.tv_sec - last_time.tv_sec;
@ -473,7 +473,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
int totaldownload = 0; int totaldownload = 0;
off_t xfered, total; off_t xfered, total;
float rate = 0.0, timediff = 0.0, f_xfered = 0.0; double rate = 0.0, timediff = 0.0, f_xfered = 0.0;
unsigned int eta_h = 0, eta_m = 0, eta_s = 0; unsigned int eta_h = 0, eta_m = 0, eta_s = 0;
int file_percent = 0, total_percent = 0; int file_percent = 0, total_percent = 0;
char rate_size = 'K', xfered_size = 'K'; char rate_size = 'K', xfered_size = 'K';
@ -532,7 +532,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
} else if(file_xfered == file_total) { } else if(file_xfered == file_total) {
/* compute final values */ /* compute final values */
struct timeval current_time; struct timeval current_time;
float diff_sec, diff_usec; double diff_sec, diff_usec;
gettimeofday(&current_time, NULL); gettimeofday(&current_time, NULL);
diff_sec = current_time.tv_sec - initial_time.tv_sec; diff_sec = current_time.tv_sec - initial_time.tv_sec;

6
src/pacman/package.c
View file

@ -106,15 +106,15 @@ void dump_pkg_full(pmpkg_t *pkg, int level)
list_display(_("Replaces :"), alpm_pkg_get_replaces(pkg)); list_display(_("Replaces :"), alpm_pkg_get_replaces(pkg));
if(level < 0) { if(level < 0) {
printf(_("Download Size : %6.2f K\n"), printf(_("Download Size : %6.2f K\n"),
(float)alpm_pkg_get_size(pkg) / 1024.0); (double)alpm_pkg_get_size(pkg) / 1024.0);
} }
if(level == 0) { if(level == 0) {
printf(_("Compressed Size: %6.2f K\n"), printf(_("Compressed Size: %6.2f K\n"),
(float)alpm_pkg_get_size(pkg) / 1024.0); (double)alpm_pkg_get_size(pkg) / 1024.0);
} }
printf(_("Installed Size : %6.2f K\n"), printf(_("Installed Size : %6.2f K\n"),
(float)alpm_pkg_get_isize(pkg) / 1024.0); (double)alpm_pkg_get_isize(pkg) / 1024.0);
string_display(_("Packager :"), alpm_pkg_get_packager(pkg)); string_display(_("Packager :"), alpm_pkg_get_packager(pkg));
string_display(_("Architecture :"), alpm_pkg_get_arch(pkg)); string_display(_("Architecture :"), alpm_pkg_get_arch(pkg));
string_display(_("Build Date :"), bdatestr); string_display(_("Build Date :"), bdatestr);

3
src/pacman/util.c
View file

@ -644,8 +644,7 @@ void print_packages(const alpm_list_t *packages)
/* %s : size */ /* %s : size */
if(strstr(temp,"%s")) { if(strstr(temp,"%s")) {
char *size; char *size;
double mbsize = 0.0; double mbsize = (double)pkg_get_size(pkg) / (1024.0 * 1024.0);
mbsize = (double)pkg_get_size(pkg) / (1024.0 * 1024.0);
pm_asprintf(&size, "%.2f", mbsize); pm_asprintf(&size, "%.2f", mbsize);
string = strreplace(temp, "%s", size); string = strreplace(temp, "%s", size);
free(size); free(size);