index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> | 2013-01-03 18:48:52 -0300 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2013-01-04 21:49:37 +1000 |
commit | b5709b8171c5be82ebb3651680ae3698b7513f43 (patch) | |
tree | 51993e70ae95ccecf0c74c5e82d45c4915421efa /lib/libalpm | |
parent | e13a3bf5990d03cca25c86efbfbaf2540d645413 (diff) |
-rw-r--r-- | lib/libalpm/conflict.c | 3 | ||||
-rw-r--r-- | lib/libalpm/handle.c | 5 | ||||
-rw-r--r-- | lib/libalpm/signing.c | 3 |
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 5fbdfc89..0080e7cf 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -133,7 +133,8 @@ static int add_conflict(alpm_handle_t *handle, alpm_list_t **baddeps, */ static void check_conflict(alpm_handle_t *handle, alpm_list_t *list1, alpm_list_t *list2, - alpm_list_t **baddeps, int order) { + alpm_list_t **baddeps, int order) +{ alpm_list_t *i; if(!baddeps) { diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 75aaf9db..1a840ab8 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -314,7 +314,8 @@ int SYMEXPORT alpm_option_set_progresscb(alpm_handle_t *handle, alpm_cb_progress return 0; } -static char *canonicalize_path(const char *path) { +static char *canonicalize_path(const char *path) +{ char *new_path; size_t len; @@ -331,7 +332,7 @@ static char *canonicalize_path(const char *path) { alpm_errno_t _alpm_set_directory_option(const char *value, char **storage, int must_exist) - { +{ struct stat st; char real[PATH_MAX]; const char *path; diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 22d4d3d4..606b6a61 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -379,7 +379,8 @@ error: * @return 0 on success, -1 on failure to properly decode */ static int decode_signature(const char *base64_data, - unsigned char **data, size_t *data_len) { + unsigned char **data, size_t *data_len) +{ size_t len = strlen(base64_data); unsigned char *usline = (unsigned char *)base64_data; /* reasonable allocation of expected length is 3/4 of encoded length */ |