Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=eb0a311cc22da647a1cfde202351f2cc1785eda9
commit eb0a311cc22da647a1cfde202351f2cc1785eda9 Author: Michel Hermier <[email protected]> Date: Thu Nov 28 12:08:26 2013 +0100 libpacman: Remove PM_OPT_DLETA_*. diff --git a/doc/libpacman-changes.txt b/doc/libpacman-changes.txt index e045aa6..58de992 100644 --- a/doc/libpacman-changes.txt +++ b/doc/libpacman-changes.txt @@ -76,7 +76,7 @@ PM_TRANS_SYNCPKGS: Access to transaction syncpkgs list. ==== Symbols removed: -PM_NETBUF, PM_OPT_DLRATE, PM_OPT_DLOFFSET, PM_OPT_DLT0: Removed due to code refactor so public API does not try to hide that it use libftp internal callback. See pacman_trans_cb_download changes. +PM_NETBUF, PM_OPT_DLETA_H, PM_OPT_DLETA_M, PM_OPT_DLETA_H, PM_OPT_DLOFFSET, PM_OPT_DLRATE, PM_OPT_DLT0: Removed due to code refactor so public API does not try to hide that it use libftp internal callback. See pacman_trans_cb_download changes. PM_TRANS: Unused in the public API. diff --git a/lib/libpacman/handle.c b/lib/libpacman/handle.c index 90c330d..94bc6f0 100644 --- a/lib/libpacman/handle.c +++ b/lib/libpacman/handle.c @@ -239,15 +239,6 @@ int _pacman_handle_set_option(pmhandle_t *ph, unsigned char val, unsigned long d case PM_OPT_DLXFERED1: pm_dlxfered1 = (int *)data; break; - case PM_OPT_DLETA_H: - pm_dleta_h = (unsigned int *)data; - break; - case PM_OPT_DLETA_M: - pm_dleta_m = (unsigned int *)data; - break; - case PM_OPT_DLETA_S: - pm_dleta_s = (unsigned int *)data; - break; case PM_OPT_DLREMAIN: ph->dlremain = (int *)data; break; @@ -344,9 +335,6 @@ int _pacman_handle_get_option(pmhandle_t *ph, unsigned char val, long *data) case PM_OPT_DLFNM: *data = (long)pm_dlfnm; break; case PM_OPT_DLT: *data = (long)pm_dlt; break; case PM_OPT_DLXFERED1: *data = (long)pm_dlxfered1; break; - case PM_OPT_DLETA_H: *data = (long)pm_dleta_h; break; - case PM_OPT_DLETA_M: *data = (long)pm_dleta_m; break; - case PM_OPT_DLETA_S: *data = (long)pm_dleta_s; break; case PM_OPT_DLREMAIN: *data = (long)ph->dlremain; break; case PM_OPT_DLHOWMANY: *data = (long)ph->dlhowmany; break; case PM_OPT_PROXYHOST: *data = (long)ph->proxyhost; break; diff --git a/lib/libpacman/pacman.h b/lib/libpacman/pacman.h index 44573c5..b72f74d 100644 --- a/lib/libpacman/pacman.h +++ b/lib/libpacman/pacman.h @@ -120,9 +120,6 @@ enum { PM_OPT_DLFNM, PM_OPT_DLT, PM_OPT_DLXFERED1, - PM_OPT_DLETA_H, - PM_OPT_DLETA_M, - PM_OPT_DLETA_S, /* End of download */ PM_OPT_HOLDPKG, PM_OPT_CHOMP, diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c index ccd03a5..1de5c03 100644 --- a/lib/libpacman/server.c +++ b/lib/libpacman/server.c @@ -49,7 +49,6 @@ pacman_trans_cb_download pm_dlcb = NULL; char *pm_dlfnm=NULL; struct timeval *pm_dlt=NULL; int *pm_dlxfered1=NULL; -unsigned int *pm_dleta_h=NULL, *pm_dleta_m=NULL, *pm_dleta_s=NULL; pmserver_t *_pacman_server_new(char *url) { @@ -232,12 +231,9 @@ pmdownloadsuccess_t _pacman_curl_download(pmcurldownloader_t *curldownloader, co /* ETA setup */ gettimeofday(&curldownloader->download.dst_begin, NULL); - if(pm_dlt && pm_dlxfered1 && pm_dleta_h && pm_dleta_m && pm_dleta_s) { + if(pm_dlt && pm_dlxfered1) { *pm_dlt = curldownloader->download.dst_begin; *pm_dlxfered1 = 0; - *pm_dleta_h = 0; - *pm_dleta_m = 0; - *pm_dleta_s = 0; } if(mtime1 && mtime2 && !handle->proxyhost) { diff --git a/lib/libpacman/server.h b/lib/libpacman/server.h index aa71913..b5f94ca 100644 --- a/lib/libpacman/server.h +++ b/lib/libpacman/server.h @@ -68,7 +68,6 @@ extern pacman_trans_cb_download pm_dlcb; extern char *pm_dlfnm; extern struct timeval *pm_dlt; extern int *pm_dlxfered1; -extern unsigned int *pm_dleta_h, *pm_dleta_m, *pm_dleta_s; #endif /* _PACMAN_SERVER_H */ diff --git a/src/pacman-g2/download.c b/src/pacman-g2/download.c index e9fb2b8..62d1ea2 100644 --- a/src/pacman-g2/download.c +++ b/src/pacman-g2/download.c @@ -43,7 +43,7 @@ char sync_fnm[PM_DLFNM_LEN+1]; struct timeval t; int xfered1; -unsigned int eta_h, eta_m, eta_s, remain, howmany; +unsigned int remain, howmany; /* pacman options */ extern config_t *config; @@ -59,7 +59,8 @@ int log_progress(const pmdownload_t *download) unsigned int i, cur; struct timeval t1; float timediff; - double rate; + double eta, rate; + unsigned int eta_h, eta_m, eta_s; /* a little hard to conceal easter eggs in open-source software, but * they're still fun. ;) */ @@ -99,16 +100,17 @@ int log_progress(const pmdownload_t *download) if(xfered+offset == fsz) { pacman_download_avg(download, &rate); /* total download time */ - eta_s = (int)timediff; + eta = (int)timediff; } else if(timediff > 1) { /* we avoid computing the rate & ETA on too small periods of time, so that results are more significant */ pacman_download_rate(download, &rate); xfered1 = xfered; gettimeofday(&t, NULL); - eta_s = (fsz-(xfered+offset)) / (rate * 1024); + pacman_download_eta(download, &eta); } rate /= 1024; /* convert to KB/s */ + eta_s = eta; eta_h = eta_s / 3600; eta_s -= eta_h * 3600; eta_m = eta_s / 60; diff --git a/src/pacman-g2/pacman-g2.c b/src/pacman-g2/pacman-g2.c index c63ccb9..7d4ea76 100644 --- a/src/pacman-g2/pacman-g2.c +++ b/src/pacman-g2/pacman-g2.c @@ -581,18 +581,6 @@ int main(int argc, char *argv[]) ERR(NL, _("failed to set option DLXFERED1 (%s)\n"), pacman_strerror(pm_errno)); cleanup(1); } - if(pacman_set_option(PM_OPT_DLETA_H, (long)&eta_h) == -1) { - ERR(NL, _("failed to set option DLETA_H (%s)\n"), pacman_strerror(pm_errno)); - cleanup(1); - } - if(pacman_set_option(PM_OPT_DLETA_M, (long)&eta_m) == -1) { - ERR(NL, _("failed to set option DLETA_M (%s)\n"), pacman_strerror(pm_errno)); - cleanup(1); - } - if(pacman_set_option(PM_OPT_DLETA_S, (long)&eta_s) == -1) { - ERR(NL, _("failed to set option DLETA_S (%s)\n"), pacman_strerror(pm_errno)); - cleanup(1); - } if(pacman_set_option(PM_OPT_DLREMAIN, (long)&remain) == -1) { ERR(NL, _("failed to set option DLREMAIN (%s)\n"), pacman_strerror(pm_errno)); cleanup(1); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
