From b3318946ce5725da43c4bf7eeea1b73129c47d2a Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Fri, 3 Sep 2021 05:12:25 +0000 Subject: [PATCH] upstream: Remove redundant attrib_clear in upload_dir_internal. The subsequent call to stat_to_attrib clears the struct as its first step anyway. From pmeinhardt via github PR#220, ok djm@ OpenBSD-Commit-ID: f5234fc6d7425b607e179acb3383f21716f3029e --- sftp-client.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sftp-client.c b/sftp-client.c index 5bfff90d1..9de9afa20 100644 --- a/sftp-client.c +++ b/sftp-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-client.c,v 1.154 2021/08/09 23:47:44 djm Exp $ */ +/* $OpenBSD: sftp-client.c,v 1.155 2021/09/03 05:12:25 dtucker Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller * @@ -2039,7 +2039,6 @@ upload_dir_internal(struct sftp_conn *conn, const char *src, const char *dst, if (print_flag && print_flag != SFTP_PROGRESS_ONLY) mprintf("Entering %s\n", src); - attrib_clear(&a); stat_to_attrib(&sb, &a); a.flags &= ~SSH2_FILEXFER_ATTR_SIZE; a.flags &= ~SSH2_FILEXFER_ATTR_UIDGID;