From 1568fd98d882add6c91255b331592691f399bd3f Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Sat, 21 Oct 2006 01:27:35 +0000
Subject: Minor changes: * Moved the pmhandle_t extern decl around *
Fixed a doxygen complaint
---
lib/libalpm/add.c | 2 --
lib/libalpm/alpm.c | 2 +-
lib/libalpm/be_files.c | 2 --
lib/libalpm/db.c | 2 --
lib/libalpm/handle.h | 2 ++
lib/libalpm/remove.c | 2 --
lib/libalpm/server.c | 1 -
lib/libalpm/sync.c | 2 --
lib/libalpm/trans.c | 2 --
9 files changed, 3 insertions(+), 14 deletions(-)
(limited to 'lib')
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index bbf9d532..82b238bd 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -58,8 +58,6 @@
#include "remove.h"
#include "handle.h"
-extern pmhandle_t *handle;
-
static int add_faketarget(pmtrans_t *trans, char *name)
{
char *ptr, *p;
diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index 9702ad95..5868ddfe 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -302,7 +302,7 @@ int alpm_db_setserver(pmdb_t *db, char *url)
}
/** Update a package database
- * @param level if true, then forces the update, otherwise update only in case
+ * @param force if true, then forces the update, otherwise update only in case
* @param db pointer to the package database to update
* @return 0 on success, > 0 on error (pm_errno is set accordingly), < 0 if up
* to date
diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c
index 128ba77d..dad406dc 100644
--- a/lib/libalpm/be_files.c
+++ b/lib/libalpm/be_files.c
@@ -44,8 +44,6 @@
#include "error.h"
#include "handle.h"
-extern pmhandle_t *handle;
-
int _alpm_db_open(pmdb_t *db)
{
if(db == NULL) {
diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c
index 2bbc4a4b..39134680 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -50,8 +50,6 @@
#include "cache.h"
#include "alpm.h"
-extern pmhandle_t *handle;
-
pmdb_t *_alpm_db_new(char *root, char* dbpath, char *treename)
{
pmdb_t *db;
diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h
index 0bd37afd..9311f724 100644
--- a/lib/libalpm/handle.h
+++ b/lib/libalpm/handle.h
@@ -59,6 +59,8 @@ typedef struct __pmhandle_t {
pmlist_t *needles; /* for searching */
} pmhandle_t;
+extern pmhandle_t *handle;
+
#define FREEHANDLE(p) do { if (p) { _alpm_handle_free(p); p = NULL; } } while (0)
pmhandle_t *_alpm_handle_new(void);
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index 75d01f63..39937eed 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -58,8 +58,6 @@
#include "handle.h"
#include "alpm.h"
-extern pmhandle_t *handle;
-
int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
{
pmpkg_t *info;
diff --git a/lib/libalpm/server.c b/lib/libalpm/server.c
index 7b2f037c..a5ae9e9f 100644
--- a/lib/libalpm/server.c
+++ b/lib/libalpm/server.c
@@ -38,7 +38,6 @@
#include "util.h"
#include "handle.h"
-extern pmhandle_t *handle;
FtpCallback pm_dlcb = NULL;
/* progress bar */
char *pm_dlfnm=NULL;
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index ffc69bf8..523d2372 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -55,8 +55,6 @@
#include "handle.h"
#include "server.h"
-extern pmhandle_t *handle;
-
pmsyncpkg_t *_alpm_sync_new(int type, pmpkg_t *spkg, void *data)
{
pmsyncpkg_t *sync;
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index 2e34f570..4946bfe0 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -39,8 +39,6 @@
#include "sync.h"
#include "alpm.h"
-extern pmhandle_t *handle;
-
pmtrans_t *_alpm_trans_new()
{
pmtrans_t *trans;
--
cgit v1.2.3-70-g09d2