| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | lib/libalpm/conflict.c | 3 | ||||
| -rw-r--r-- | lib/libalpm/handle.c | 5 | ||||
| -rw-r--r-- | lib/libalpm/signing.c | 3 | ||||
| -rw-r--r-- | src/pacman/conf.c | 12 | ||||
| -rw-r--r-- | src/pacman/pacman.c | 3 | ||||
| -rw-r--r-- | src/pacman/util.c | 3 | ||||
| -rw-r--r-- | src/util/cleanupdelta.c | 9 | ||||
| -rw-r--r-- | src/util/pactree.c | 7 |
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 */ diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 6ea7fe22..1bea2b0e 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -90,7 +90,8 @@ int config_free(config_t *oldconfig) } /** Helper function for download_with_xfercommand() */ -static char *get_filename(const char *url) { +static char *get_filename(const char *url) +{ char *filename = strrchr(url, '/'); if(filename != NULL) { filename++; @@ -99,7 +100,8 @@ static char *get_filename(const char *url) { } /** Helper function for download_with_xfercommand() */ -static char *get_destfile(const char *path, const char *filename) { +static char *get_destfile(const char *path, const char *filename) +{ char *destfile; /* len = localpath len + filename len + null */ size_t len = strlen(path) + strlen(filename) + 1; @@ -110,7 +112,8 @@ static char *get_destfile(const char *path, const char *filename) { } /** Helper function for download_with_xfercommand() */ -static char *get_tempfile(const char *path, const char *filename) { +static char *get_tempfile(const char *path, const char *filename) +{ char *tempfile; /* len = localpath len + filename len + '.part' len + null */ size_t len = strlen(path) + strlen(filename) + 6; @@ -122,7 +125,8 @@ static char *get_tempfile(const char *path, const char *filename) { /** External fetch callback */ static int download_with_xfercommand(const char *url, const char *localpath, - int force) { + int force) +{ int ret = 0, retval; int usepart = 0; int cwdfd; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index f293a5d1..f3ca8b97 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -258,7 +258,8 @@ static void setuseragent(void) * * @param ret the return value */ -static void cleanup(int ret) { +static void cleanup(int ret) +{ /* free alpm library resources */ if(config->handle && alpm_release(config->handle) == -1) { pm_printf(ALPM_LOG_ERROR, "error releasing alpm library\n"); diff --git a/src/pacman/util.c b/src/pacman/util.c index 27e1f158..03063fb5 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -130,7 +130,8 @@ int check_syncdbs(size_t need_repos, int check_valid) } /* discard unhandled input on the terminal's input buffer */ -static int flush_term_input(int fd) { +static int flush_term_input(int fd) +{ #ifdef HAVE_TCFLUSH if(isatty(fd)) { return tcflush(fd, TCIFLUSH); diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index eecb1aeb..144e0388 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -28,7 +28,8 @@ alpm_handle_t *handle = NULL; -static void cleanup(int signum) { +static void cleanup(int signum) +{ if(handle && alpm_release(handle) == -1) { fprintf(stderr, "error releasing alpm\n"); } @@ -64,7 +65,8 @@ static void checkpkgs(alpm_list_t *pkglist) } } -static void checkdbs(alpm_list_t *dbnames) { +static void checkdbs(alpm_list_t *dbnames) +{ alpm_db_t *db = NULL; alpm_list_t *i; const alpm_siglevel_t level = ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; @@ -82,7 +84,8 @@ static void checkdbs(alpm_list_t *dbnames) { } -static void usage(void) { +static void usage(void) +{ fprintf(stderr, "usage:\n"); fprintf(stderr, "\t%s [-b <pacman db>] core extra ... : check the listed sync databases\n", BASENAME); diff --git a/src/util/pactree.c b/src/util/pactree.c index 9125f581..33cf66c4 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -178,7 +178,8 @@ static size_t strtrim(char *str) return end - pch; } -static int register_syncs(void) { +static int register_syncs(void) +{ FILE *fp; char *section = NULL; char line[LINE_MAX]; @@ -350,7 +351,7 @@ static void print_text(const char *pkg, const char *provision, depth = depth->prev; } printf("%s", color->branch1); - while(depth->next){ + while(depth->next) { printf("%*s%-*s", style->indent * (depth->level - level), "", style->indent, style->limb); level = depth->level + 1; @@ -471,7 +472,7 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int r }; depth->next = &d; /* last dep, cut off the limb here */ - if(last){ + if(last) { if(depth->prev) { depth->prev->next = &d; d.prev = depth->prev; |