commit 117e771c4a3fee5f8e2f87bcb7d3314b99ccdc28 from: Stefan Sperling date: Mon Jul 23 09:34:57 2018 UTC eliminate local 'obj' variable in got's print_patch() commit - fa2f6902709b3373f9da09bd711b660eeaf6e48c commit + 117e771c4a3fee5f8e2f87bcb7d3314b99ccdc28 blob - 5edca44ff870e002ec1401768f07b519ef6b5787 blob + 21b696a14044185473bf54c97ff7dc48f3a7d678 --- got/got.c +++ got/got.c @@ -269,15 +269,9 @@ print_patch(struct got_commit_object *commit, struct g { const struct got_error *err = NULL; struct got_tree_object *tree1 = NULL, *tree2; - struct got_object *obj; struct got_object_qid *qid; - - err = got_object_open(&obj, repo, commit->tree_id); - if (err) - return err; - err = got_object_tree_open(&tree2, repo, obj); - got_object_close(obj); + err = got_object_open_as_tree(&tree2, repo, commit->tree_id); if (err) return err; @@ -285,21 +279,12 @@ print_patch(struct got_commit_object *commit, struct g if (qid != NULL) { struct got_commit_object *pcommit; - err = got_object_open(&obj, repo, qid->id); - if (err) - return err; - - err = got_object_commit_open(&pcommit, repo, obj); - got_object_close(obj); + err = got_object_open_as_commit(&pcommit, repo, qid->id); if (err) return err; - err = got_object_open(&obj, repo, pcommit->tree_id); + err = got_object_open_as_tree(&tree1, repo, pcommit->tree_id); got_object_commit_close(pcommit); - if (err) - return err; - err = got_object_tree_open(&tree1, repo, obj); - got_object_close(obj); if (err) return err; }