summaryrefslogtreecommitdiff
path: root/lib/libalpm/server.h
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-11-20 09:10:23 +0000
committerAaron Griffin <aaron@archlinux.org>2006-11-20 09:10:23 +0000
commitaa1c0ba9f8787fc3b1a1190103e394b0c1c95922 (patch)
treeed0c9675f7fc5da043a69b36e0b8c6c8e05cb583 /lib/libalpm/server.h
parentb8b9596b13de957566211b0e1db3e473ed66e147 (diff)
downloadpacman-aa1c0ba9f8787fc3b1a1190103e394b0c1c95922.tar.xz
* repo-add script - to add entries to a db file directly from package data (no PKGBUILD)
* libalpm api changes - move from a _getinfo(p, WHAT_WE_WANT) scheme to a typesafe _get_what_we_want(p) scheme [not 100% complete yet] * some const correctness changes * removal of PM_* types in alpm.h in favor of the pm*_t types used throughout libalpm
Diffstat (limited to 'lib/libalpm/server.h')
-rw-r--r--lib/libalpm/server.h20
1 files changed, 5 insertions, 15 deletions
diff --git a/lib/libalpm/server.h b/lib/libalpm/server.h
index 5ce848cc..80e9a7e1 100644
--- a/lib/libalpm/server.h
+++ b/lib/libalpm/server.h
@@ -22,30 +22,22 @@
#define _ALPM_SERVER_H
#include "list.h"
-#include <time.h>
+#include "alpm.h"
+#include <time.h>
#include <download.h>
-#define FREESERVER(p) \
-do { \
- if(p) { \
- _alpm_server_free(p); \
- p = NULL; \
- } \
-} while(0)
-
+#define FREESERVER(p) do { if(p){_alpm_server_free(p); p = NULL;}} while(0)
#define FREELISTSERVERS(p) _FREELIST(p, _alpm_server_free)
/* Servers */
-typedef struct __pmserver_t {
+struct __pmserver_t {
char *path;
struct url *s_url;
-} pmserver_t;
+};
#define PM_DLBUF_LEN (1024 * 10)
-typedef void (*download_progress_cb)(const char *filename, int xfered, int total);
-
pmserver_t *_alpm_server_new(const char *url);
void _alpm_server_free(void *data);
int _alpm_downloadfiles(pmlist_t *servers, const char *localpath, pmlist_t *files);
@@ -54,8 +46,6 @@ int _alpm_downloadfiles_forreal(pmlist_t *servers, const char *localpath,
char *_alpm_fetch_pkgurl(char *target);
-extern download_progress_cb pm_dlcb;
-
#endif /* _ALPM_SERVER_H */
/* vim: set ts=2 sw=2 noet: */