summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-11-14 08:07:57 +0000
committerAaron Griffin <aaron@archlinux.org>2006-11-14 08:07:57 +0000
commiteb514bee967d396410e0647f5cd2a897cc619d0f (patch)
tree7545b63c9950a8f30826d756a2da517b2ffd9eea
parent4470e5ce011fef0c918b5c3d1d42ae333fb361ba (diff)
* autotool fixes
* Renamed "download" files to "downloadprog" as it only holds the progress bar and to not confuse (myself) with <download.h>
-rw-r--r--configure.ac1
-rw-r--r--src/pacman/downloadprog.c (renamed from src/pacman/download.c)4
-rw-r--r--src/pacman/downloadprog.h (renamed from src/pacman/download.h)15
3 files changed, 6 insertions, 14 deletions
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
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 <jvinet@zeroflux.org>
*
@@ -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
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 <jvinet@zeroflux.org>
*
@@ -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: */