summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libalpm/db.c2
-rw-r--r--lib/libalpm/sync.c3
-rw-r--r--lib/libalpm/util.c4
-rw-r--r--src/pacman/pacman.c2
4 files changed, 6 insertions, 5 deletions
diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c
index bf9c3f0a..953f2af6 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -281,7 +281,7 @@ alpm_list_t SYMEXPORT *alpm_db_get_groupcache(alpm_db_t *db)
}
/** Searches a database. */
-alpm_list_t SYMEXPORT *alpm_db_search(alpm_db_t *db, const alpm_list_t* needles)
+alpm_list_t SYMEXPORT *alpm_db_search(alpm_db_t *db, const alpm_list_t *needles)
{
ASSERT(db != NULL, return NULL);
db->handle->pm_errno = 0;
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 66f7ed17..ca6b507e 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -125,7 +125,8 @@ static alpm_list_t *check_replacers(alpm_handle_t *handle, alpm_pkg_t *lpkg,
alpm_list_t *replacers = NULL;
alpm_list_t *k;
_alpm_log(handle, ALPM_LOG_DEBUG,
- "searching for replacements for %s\n", lpkg->name);
+ "searching for replacements for %s in %s\n",
+ lpkg->name, sdb->treename);
for(k = _alpm_db_get_pkgcache(sdb); k; k = k->next) {
int found = 0;
alpm_pkg_t *spkg = k->data;
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 0196f3bb..033058a0 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -65,9 +65,9 @@
* @return pointer to the first token in str if str is not NULL, NULL if
* str is NULL
*/
-char* strsep(char** str, const char* delims)
+char *strsep(char **str, const char *delims)
{
- char* token;
+ char *token;
if(*str==NULL) {
/* No more tokens */
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 73d5be94..478196e2 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -719,7 +719,7 @@ static int parseargs(int argc, char *argv[])
* @param argc
* @param argv
*/
-static void cl_to_log(int argc, char* argv[])
+static void cl_to_log(int argc, char *argv[])
{
size_t size = 0;
int i;