Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4e2959f0654fcae7e5c774f12de852a63ce2c418
commit 4e2959f0654fcae7e5c774f12de852a63ce2c418
Author: Michel Hermier <herm...@frugalware.org>
Date: Thu Nov 28 13:00:00 2013 +0100
libpacman: Remove PM_OPT_DLXFERED1.
diff --git a/doc/libpacman-changes.txt b/doc/libpacman-changes.txt
index 58de992..40be12b 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_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_NETBUF, PM_OPT_DLETA_H, PM_OPT_DLETA_M, PM_OPT_DLETA_H, PM_OPT_DLOFFSET,
PM_OPT_DLRATE, PM_OPT_DLT0, PM_OPT_DLXFERED1: 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 94bc6f0..47bd513 100644
--- a/lib/libpacman/handle.c
+++ b/lib/libpacman/handle.c
@@ -236,9 +236,6 @@ int _pacman_handle_set_option(pmhandle_t *ph, unsigned char
val, unsigned long d
case PM_OPT_DLT:
pm_dlt = (struct timeval *)data;
break;
- case PM_OPT_DLXFERED1:
- pm_dlxfered1 = (int *)data;
- break;
case PM_OPT_DLREMAIN:
ph->dlremain = (int *)data;
break;
@@ -334,7 +331,6 @@ int _pacman_handle_get_option(pmhandle_t *ph, unsigned char
val, long *data)
case PM_OPT_LOGMASK: *data = pm_logmask; break;
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_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 b72f74d..9a08090 100644
--- a/lib/libpacman/pacman.h
+++ b/lib/libpacman/pacman.h
@@ -119,7 +119,6 @@ enum {
PM_OPT_DLCB,
PM_OPT_DLFNM,
PM_OPT_DLT,
- PM_OPT_DLXFERED1,
/* End of download */
PM_OPT_HOLDPKG,
PM_OPT_CHOMP,
diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c
index f78b4c8..9db0fe7 100644
--- a/lib/libpacman/server.c
+++ b/lib/libpacman/server.c
@@ -48,7 +48,6 @@ pacman_trans_cb_download pm_dlcb = NULL;
/* progress bar */
char *pm_dlfnm=NULL;
struct timeval *pm_dlt=NULL;
-int *pm_dlxfered1=NULL;
pmserver_t *_pacman_server_new(char *url)
{
@@ -227,9 +226,8 @@ pmdownloadsuccess_t
_pacman_curl_download(pmcurldownloader_t *curldownloader, co
/* ETA setup */
gettimeofday(&curldownloader->download.dst_begin, NULL);
- if(pm_dlt && pm_dlxfered1) {
+ if(pm_dlt) {
*pm_dlt = curldownloader->download.dst_begin;
- *pm_dlxfered1 = 0;
}
if(mtime1 && mtime2 && !handle->proxyhost) {
diff --git a/src/pacman-g2/download.c b/src/pacman-g2/download.c
index 62d1ea2..c376396 100644
--- a/src/pacman-g2/download.c
+++ b/src/pacman-g2/download.c
@@ -105,7 +105,6 @@ int log_progress(const pmdownload_t *download)
/* 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);
pacman_download_eta(download, &eta);
}
diff --git a/src/pacman-g2/download.h b/src/pacman-g2/download.h
index ac6d7c3..2f83005 100644
--- a/src/pacman-g2/download.h
+++ b/src/pacman-g2/download.h
@@ -28,7 +28,6 @@
extern char sync_fnm[PM_DLFNM_LEN+1];
extern int offset;
extern struct timeval t;
-extern int xfered1;
extern unsigned int eta_h, eta_m, eta_s, remain, howmany;
int log_progress(const pmdownload_t *download);
diff --git a/src/pacman-g2/pacman-g2.c b/src/pacman-g2/pacman-g2.c
index 7d4ea76..8b9c24f 100644
--- a/src/pacman-g2/pacman-g2.c
+++ b/src/pacman-g2/pacman-g2.c
@@ -577,10 +577,6 @@ int main(int argc, char *argv[])
ERR(NL, _("failed to set option DLT (%s)\n"), pacman_strerror(pm_errno));
cleanup(1);
}
- if(pacman_set_option(PM_OPT_DLXFERED1, (long)&xfered1) == -1) {
- ERR(NL, _("failed to set option DLXFERED1 (%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
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
