commit c0df59665de91324eeab1808c6c4e41343f21789 from: Stefan Sperling date: Fri Dec 31 09:33:01 2021 UTC wrap overlong lines commit - e7ae0bafeffce6697bc3b67fda753e5bac995cb6 commit + c0df59665de91324eeab1808c6c4e41343f21789 blob - 0b61ca99747d4d1bde47a50eecd572ce88c838f8 blob + f551f71ac97f147d51b0c32e92dce6513394be94 --- got/got.c +++ got/got.c @@ -8449,7 +8449,8 @@ done: } static const struct got_error * -show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo) +show_rebase_merge_conflict(struct got_object_id *id, + struct got_repository *repo) { const struct got_error *err; struct got_commit_object *commit = NULL; @@ -8833,7 +8834,8 @@ done: } static const struct got_error * -process_backup_refs(const char *backup_ref_prefix, const char *wanted_branch_name, +process_backup_refs(const char *backup_ref_prefix, + const char *wanted_branch_name, int delete, struct got_repository *repo) { const struct got_error *err; blob - b6870a5a2324dda8c85c26409b7fd6329fa970ed blob + 592e77655be88e831265856057c0f2f4d253128e --- include/got_object.h +++ include/got_object.h @@ -186,7 +186,8 @@ void got_object_tree_close(struct got_tree_object *); int got_object_tree_get_nentries(struct got_tree_object *); /* Get the first tree entry from a tree, or NULL if there is none. */ -struct got_tree_entry *got_object_tree_get_first_entry(struct got_tree_object *); +struct got_tree_entry *got_object_tree_get_first_entry( + struct got_tree_object *); /* Get the last tree entry from a tree, or NULL if there is none. */ struct got_tree_entry *got_object_tree_get_last_entry(struct got_tree_object *); blob - dedfb8f826bb8de777445aaff9b19bc8a855d36e blob + 98714899272ce0d54688d9e1a90e5ac5f0e93087 --- include/got_reference.h +++ include/got_reference.h @@ -137,8 +137,9 @@ void got_ref_list_free(struct got_reflist_head *); * elements by got_ref_list_free(). */ const struct got_error * -got_reflist_insert(struct got_reflist_entry **newp, struct got_reflist_head *refs, - struct got_reference *ref, got_ref_cmp_cb cmp_cb, void *cmp_arg); +got_reflist_insert(struct got_reflist_entry **newp, + struct got_reflist_head *refs, struct got_reference *ref, + got_ref_cmp_cb cmp_cb, void *cmp_arg); /* Sort a list of references with the provided comparison callback. */ const struct got_error * blob - ec933af31517a8e95d2772b7199c7efcb9064c82 blob + aa2b7c68c35e277c2b4e8eff9fad03155fada78e --- lib/diff3.c +++ lib/diff3.c @@ -170,7 +170,8 @@ static int ed_patch_lines(struct rcs_lines *, struct r static const struct got_error *skip(size_t *, int, int, struct diff3_state *); static const struct got_error *edscript(int, struct diff3_state *); static const struct got_error *merge(size_t, size_t, struct diff3_state *); -static const struct got_error *prange(struct line_range *, struct diff3_state *); +static const struct got_error *prange(struct line_range *, + struct diff3_state *); static const struct got_error *repos(int, struct diff3_state *); static const struct got_error *increase(struct diff3_state *); static const struct got_error *diff3_internal(char *, char *, char *, blob - 60539f2a09b85e1abbc55e1e6fb94f7210db3b14 blob + 71a058b11b7499d2dd17a72a9d69aafdb49f8874 --- lib/fileindex.c +++ lib/fileindex.c @@ -220,7 +220,8 @@ got_fileindex_entry_filetype_set(struct got_fileindex_ } void -got_fileindex_entry_staged_filetype_set(struct got_fileindex_entry *ie, int type) +got_fileindex_entry_staged_filetype_set(struct got_fileindex_entry *ie, + int type) { ie->mode &= ~GOT_FILEIDX_MODE_FILE_TYPE_STAGED; ie->mode |= ((type << GOT_FILEIDX_MODE_FILE_TYPE_STAGED_SHIFT) & blob - 7bfbb245c1c4fd6b4e56e6e71e28d6253c443930 blob + 69dcf37239a234503d82e8eca0a650c347f67ee2 --- lib/got_lib_gitconfig.h +++ lib/got_lib_gitconfig.h @@ -55,4 +55,5 @@ int got_gitconfig_match_num(struct got_gitconfig const struct got_error *got_gitconfig_reinit(struct got_gitconfig *, int); int got_gitconfig_remove(struct got_gitconfig *, int, char *, char *); int got_gitconfig_remove_section(struct got_gitconfig *, int, char *); -int got_gitconfig_set(struct got_gitconfig *, int, char *, char *, char *, int, int); +int got_gitconfig_set(struct got_gitconfig *, int, char *, char *, char *, + int, int); blob - 20d9f5cca727758161b7d4f73321ba3f1b271e88 blob + 237746ff6bb85517d0512de73f542c4939d5c124 --- lib/got_lib_object_idcache.h +++ lib/got_lib_object_idcache.h @@ -21,7 +21,8 @@ void got_object_idcache_free(struct got_object_idcache const struct got_error *got_object_idcache_add(struct got_object_idcache *, struct got_object_id *, void *); -void *got_object_idcache_get(struct got_object_idcache *, struct got_object_id *); +void *got_object_idcache_get(struct got_object_idcache *, + struct got_object_id *); const struct got_error *got_object_idcache_remove_one(void **, struct got_object_idcache *, struct got_object_id *); int got_object_idcache_contains(struct got_object_idcache *, blob - 7592979912f4df4afc7d084b4a3779e769d66b04 blob + adbb8bb3e8521199cb1e1ee0ae5ad5dce3f3503d --- lib/got_lib_object_parse.h +++ lib/got_lib_object_parse.h @@ -44,5 +44,6 @@ struct got_pack; struct got_packidx; struct got_inflate_checksum; -const struct got_error *got_object_parse_header(struct got_object **, char *, size_t); +const struct got_error *got_object_parse_header(struct got_object **, char *, + size_t); const struct got_error *got_object_read_header(struct got_object **, int); blob - 5321690c142e70461340284dce43c453e354aafe blob + dc97d615eecefa57ba072dfa818660e2362700e1 --- lib/got_lib_pack.h +++ lib/got_lib_pack.h @@ -193,4 +193,5 @@ const struct got_error *got_packfile_extract_object(st struct got_object *, FILE *, FILE *, FILE *); const struct got_error *got_packfile_extract_object_to_mem(uint8_t **, size_t *, struct got_object *, struct got_pack *); -struct got_pack *got_repo_get_cached_pack(struct got_repository *, const char *); +struct got_pack *got_repo_get_cached_pack(struct got_repository *, + const char *); blob - f3cfb97dc2422b59557ad5f258c44b0578303031 blob + c684ffd1f75dff183b69b5dc0492040c65d8338b --- lib/object_cache.c +++ lib/object_cache.c @@ -146,7 +146,8 @@ get_size_raw(struct got_raw_object *raw) } const struct got_error * -got_object_cache_add(struct got_object_cache *cache, struct got_object_id *id, void *item) +got_object_cache_add(struct got_object_cache *cache, struct got_object_id *id, + void *item) { const struct got_error *err = NULL; struct got_object_cache_entry *ce; blob - cda2a94c06d5421f629332f0997eca5ce2c66c5c blob + b23b1379d56dac2d5b31ae48e64080a8c5cb768f --- lib/pack.c +++ lib/pack.c @@ -485,7 +485,8 @@ got_packidx_get_object_offset(struct got_packidx *pack } int -got_packidx_get_object_idx(struct got_packidx *packidx, struct got_object_id *id) +got_packidx_get_object_idx(struct got_packidx *packidx, + struct got_object_id *id) { u_int8_t id0 = id->sha1[0]; uint32_t totobj = be32toh(packidx->hdr.fanout_table[0xff]); @@ -730,8 +731,8 @@ parse_negative_offset(int64_t *offset, size_t *len, st } const struct got_error * -got_pack_parse_offset_delta(off_t *base_offset, size_t *len, struct got_pack *pack, - off_t offset, int tslen) +got_pack_parse_offset_delta(off_t *base_offset, size_t *len, + struct got_pack *pack, off_t offset, int tslen) { const struct got_error *err; int64_t negoffset; @@ -1028,8 +1029,8 @@ got_packfile_open_object(struct got_object **obj, stru } const struct got_error * -got_pack_get_delta_chain_max_size(uint64_t *max_size, struct got_delta_chain *deltas, - struct got_pack *pack) +got_pack_get_delta_chain_max_size(uint64_t *max_size, + struct got_delta_chain *deltas, struct got_pack *pack) { struct got_delta *delta; uint64_t base_size = 0, result_size = 0; blob - b7336cfa9779d26b5bc510b4bb45c1f5f64df5c1 blob + ea1f566d447530cb54a004e23cbef404038565bb --- lib/reference.c +++ lib/reference.c @@ -845,8 +845,9 @@ got_ref_cmp_by_commit_timestamp_descending(void *arg, } const struct got_error * -got_reflist_insert(struct got_reflist_entry **newp, struct got_reflist_head *refs, - struct got_reference *ref, got_ref_cmp_cb cmp_cb, void *cmp_arg) +got_reflist_insert(struct got_reflist_entry **newp, + struct got_reflist_head *refs, struct got_reference *ref, + got_ref_cmp_cb cmp_cb, void *cmp_arg) { const struct got_error *err; struct got_reflist_entry *new, *re; blob - 41da7b15ca61d79a06862f1f0a9534002c2cdfca blob + 40f5562db7ad3596203bf083a5084f34f1eb1b05 --- lib/repository.c +++ lib/repository.c @@ -1410,8 +1410,10 @@ match_packed_object(struct got_object_id **unique_id, packdir_fd = openat(got_repo_get_fd(repo), GOT_OBJECTS_PACK_DIR, O_DIRECTORY | O_CLOEXEC); if (packdir_fd == -1) { - if (errno != ENOENT) - err = got_error_from_errno2("openat", GOT_OBJECTS_PACK_DIR); + if (errno != ENOENT) { + err = got_error_from_errno2("openat", + GOT_OBJECTS_PACK_DIR); + } goto done; } blob - 87959af131f11571b21d37fe9087acd551dd9250 blob + dba36bee48eede3aca73746d5501b4565bbddf64 --- lib/worktree.c +++ lib/worktree.c @@ -2816,7 +2816,8 @@ merge_file_cb(void *arg, struct got_blob_object *blob1 if (err) goto done; - fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC); + fd = open(ondisk_path, + O_RDONLY | O_NOFOLLOW | O_CLOEXEC); if (fd == -1) { err = got_error_from_errno2("open", ondisk_path); @@ -4366,8 +4367,10 @@ create_patched_content(char **path_outfile, int revers } link_len = readlinkat(dirfd2, de_name2, link_target, sizeof(link_target)); - if (link_len == -1) - return got_error_from_errno2("readlinkat", path2); + if (link_len == -1) { + return got_error_from_errno2("readlinkat", + path2); + } sb2.st_mode = S_IFLNK; sb2.st_size = link_len; } blob - dc3aeafa7658e8859b4c4d595ca4d6ad52a6c875 blob + 8bbfe87a70dfd1f3c936dd572b1ab0dcf33aff61 --- libexec/got-read-pack/got-read-pack.c +++ libexec/got-read-pack/got-read-pack.c @@ -773,8 +773,9 @@ done: } static const struct got_error * -raw_object_request(struct imsg *imsg, struct imsgbuf *ibuf, struct got_pack *pack, - struct got_packidx *packidx, struct got_object_cache *objcache) +raw_object_request(struct imsg *imsg, struct imsgbuf *ibuf, + struct got_pack *pack, struct got_packidx *packidx, + struct got_object_cache *objcache) { const struct got_error *err = NULL; uint8_t *buf = NULL;