summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-01 12:13:49 -0500
committerDan McGee <dan@archlinux.org>2011-06-01 12:13:49 -0500
commit41da2253366b6f641fc3e986817ee617c9e18df3 (patch)
treec0ef91021a88bd663905a170087a7cbfec874436 /lib
parentfe9804a96d9e50a44e549c7be9189152e20893c5 (diff)
parentaad57cc06ac60dc8fdcff9bea811e990d64f74d3 (diff)
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/alpm_list.c2
-rw-r--r--lib/libalpm/handle.c2
-rw-r--r--lib/libalpm/trans.c3
3 files changed, 3 insertions, 4 deletions
diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c
index d2e09478..c2b30adc 100644
--- a/lib/libalpm/alpm_list.c
+++ b/lib/libalpm/alpm_list.c
@@ -286,7 +286,7 @@ alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, size_t n, alpm_list_fn
/**
* @brief Remove an item from the list.
- * item is not freed; this is the responsiblity of the caller.
+ * item is not freed; this is the responsibility of the caller.
*
* @param haystack the list to remove the item from
* @param item the item to remove from the list
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index 2d6766a5..39b3b600 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -44,8 +44,6 @@ pmhandle_t *_alpm_handle_new()
{
pmhandle_t *handle;
- ALPM_LOG_FUNC;
-
CALLOC(handle, 1, sizeof(pmhandle_t), RET_ERR(PM_ERR_MEMORY, NULL));
handle->sigverify = PM_PGP_VERIFY_OPTIONAL;
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index af1bccee..5ffb5df2 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -54,6 +54,8 @@ static int make_lock(pmhandle_t *handle)
int fd;
char *dir, *ptr;
+ ASSERT(handle->lockfile != NULL, return -1);
+
/* create the dir of the lockfile first */
dir = strdup(handle->lockfile);
ptr = strrchr(dir, '/');
@@ -106,7 +108,6 @@ int SYMEXPORT alpm_trans_init(pmtransflag_t flags,
/* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
-
ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1));
/* lock db */