Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f16a917253cdada910d4cebe7328636ff1f0b0f1
commit f16a917253cdada910d4cebe7328636ff1f0b0f1 Author: Michel Hermier <[email protected]> Date: Sat Nov 30 13:25:53 2013 +0100 libpacman: Remove PM_OPT_DLT. diff --git a/doc/libpacman-changes.txt b/doc/libpacman-changes.txt index 40be12b..c0424af 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, 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_NETBUF, PM_OPT_DLETA_H, PM_OPT_DLETA_M, PM_OPT_DLETA_H, PM_OPT_DLOFFSET, PM_OPT_DLRATE, PM_OPT_DLT, 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 47bd513..962d086 100644 --- a/lib/libpacman/handle.c +++ b/lib/libpacman/handle.c @@ -233,9 +233,6 @@ int _pacman_handle_set_option(pmhandle_t *ph, unsigned char val, unsigned long d case PM_OPT_DLFNM: pm_dlfnm = (char *)data; break; - case PM_OPT_DLT: - pm_dlt = (struct timeval *)data; - break; case PM_OPT_DLREMAIN: ph->dlremain = (int *)data; break; @@ -330,7 +327,6 @@ int _pacman_handle_get_option(pmhandle_t *ph, unsigned char val, long *data) case PM_OPT_OLDDELAY: *data = (long)ph->olddelay; break; 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_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 9a08090..833bb23 100644 --- a/lib/libpacman/pacman.h +++ b/lib/libpacman/pacman.h @@ -118,7 +118,6 @@ enum { PM_OPT_NOPASSIVEFTP, PM_OPT_DLCB, PM_OPT_DLFNM, - PM_OPT_DLT, /* End of download */ PM_OPT_HOLDPKG, PM_OPT_CHOMP, diff --git a/src/pacman-g2/download.c b/src/pacman-g2/download.c index 69de98c..44b505f 100644 --- a/src/pacman-g2/download.c +++ b/src/pacman-g2/download.c @@ -41,7 +41,6 @@ /* progress bar */ char sync_fnm[PM_DLFNM_LEN+1]; -struct timeval t; unsigned int remain, howmany; /* pacman options */ diff --git a/src/pacman-g2/download.h b/src/pacman-g2/download.h index db0c3b3..ff567d5 100644 --- a/src/pacman-g2/download.h +++ b/src/pacman-g2/download.h @@ -26,7 +26,6 @@ #define DLFNM_PROGRESS_LEN 22 extern char sync_fnm[PM_DLFNM_LEN+1]; -extern struct timeval t; extern unsigned int 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 8b9c24f..5d0edd6 100644 --- a/src/pacman-g2/pacman-g2.c +++ b/src/pacman-g2/pacman-g2.c @@ -573,10 +573,6 @@ int main(int argc, char *argv[]) ERR(NL, _("failed to set option DLFNM (%s)\n"), pacman_strerror(pm_errno)); cleanup(1); } - if(pacman_set_option(PM_OPT_DLT, (long)&t) == -1) { - ERR(NL, _("failed to set option DLT (%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
