Skip to content

Commit 3218cb7

Browse files
avargitster
authored andcommitted
gc: remove unused launchctl_get_uid() call
When the launchctl_boot_plist() function was added in a16eb6b (maintenance: skip bootout/bootstrap when plist is registered, 2021-08-24), an unused call to launchctl_get_uid() was added along with it. That call appears to have been copy/pasted from launchctl_boot_plist(). Since we can remove that, we can also get rid of the "result" variable, whose only purpose was allow for the free() between its assignment and the return. That pattern also appears to have been copy/pasted from launchctl_boot_plist(). As the patch shows the returned value from launchctl_get_uid() wasn't used at all in this function. The launchctl_get_uid() function itself just calls xstrfmt() and getuid(), neither of which have any subtle global side-effects, so this removal is safe. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8b7c11b commit 3218cb7

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

builtin/gc.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1602,9 +1602,7 @@ static int launchctl_remove_plists(const char *cmd)
16021602

16031603
static int launchctl_list_contains_plist(const char *name, const char *cmd)
16041604
{
1605-
int result;
16061605
struct child_process child = CHILD_PROCESS_INIT;
1607-
char *uid = launchctl_get_uid();
16081606

16091607
strvec_split(&child.args, cmd);
16101608
strvec_pushl(&child.args, "list", name, NULL);
@@ -1615,12 +1613,8 @@ static int launchctl_list_contains_plist(const char *name, const char *cmd)
16151613
if (start_command(&child))
16161614
die(_("failed to start launchctl"));
16171615

1618-
result = finish_command(&child);
1619-
1620-
free(uid);
1621-
16221616
/* Returns failure if 'name' doesn't exist. */
1623-
return !result;
1617+
return !finish_command(&child);
16241618
}
16251619

16261620
static int launchctl_schedule_plist(const char *exec_path, enum schedule_priority schedule, const char *cmd)

0 commit comments

Comments
 (0)