From eb514bee967d396410e0647f5cd2a897cc619d0f Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Tue, 14 Nov 2006 08:07:57 +0000 Subject: [PATCH] * autotool fixes * Renamed "download" files to "downloadprog" as it only holds the progress bar and to not confuse (myself) with --- configure.ac | 1 - src/pacman/{download.c => downloadprog.c} | 4 ++-- src/pacman/{download.h => downloadprog.h} | 15 ++++----------- 3 files changed, 6 insertions(+), 14 deletions(-) rename src/pacman/{download.c => downloadprog.c} (98%) rename src/pacman/{download.h => downloadprog.h} (77%) diff --git a/configure.ac b/configure.ac index c87d17b7..2c025350 100644 --- a/configure.ac +++ b/configure.ac @@ -343,7 +343,6 @@ dnl ========================================================================== AC_OUTPUT([ lib/libalpm/Makefile lib/libalpm/po/Makefile.in -lib/libftp/Makefile src/pacman/Makefile src/pacman/po/Makefile.in src/util/Makefile diff --git a/src/pacman/download.c b/src/pacman/downloadprog.c similarity index 98% rename from src/pacman/download.c rename to src/pacman/downloadprog.c index 17d0cf21..0de34d3d 100644 --- a/src/pacman/download.c +++ b/src/pacman/downloadprog.c @@ -1,5 +1,5 @@ /* - * download.c + * downloadprog.c * * Copyright (c) 2002-2006 by Judd Vinet * @@ -35,7 +35,7 @@ #include "util.h" #include "log.h" #include "list.h" -#include "download.h" +#include "downloadprog.h" #include "conf.h" /* progress bar */ diff --git a/src/pacman/download.h b/src/pacman/downloadprog.h similarity index 77% rename from src/pacman/download.h rename to src/pacman/downloadprog.h index 9fc628ce..e79fcc51 100644 --- a/src/pacman/download.h +++ b/src/pacman/downloadprog.h @@ -1,5 +1,5 @@ /* - * download.h + * downloadprog.h * * Copyright (c) 2002-2006 by Judd Vinet * @@ -18,18 +18,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ -#ifndef _PM_DOWNLOAD_H -#define _PM_DOWNLOAD_H - -extern char sync_fnm[PM_DLFNM_LEN+1]; -extern int offset; -extern struct timeval t0, t; -extern float rate; -extern int xfered1; -extern unsigned int eta_h, eta_m, eta_s; +#ifndef _PM_DOWNLOADPROG_H +#define _PM_DOWNLOADPROG_H void log_progress(const char *filename, int xfered, int total); -#endif /* _PM_DOWNLOAD_H */ +#endif /* _PM_DOWNLOADPROG_H */ /* vim: set ts=2 sw=2 noet: */