From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Haggerty Subject: [PATCH v5 03/35] rollback_lock_file(): do not clear filename redundantly Date: Tue, 16 Sep 2014 21:33:24 +0200 Message-ID: <1410896036-12750-4-git-send-email-mhagger@alum.mit.edu> References: <1410896036-12750-1-git-send-email-mhagger@alum.mit.edu> Cc: Jeff King , Ronnie Sahlberg , git@vger.kernel.org, Michael Haggerty To: Junio C Hamano , Johannes Sixt , =?UTF-8?q?Torsten=20B=C3=B6gershausen?= X-From: git-owner@vger.kernel.org Tue Sep 16 21:42:08 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XTydS-0003W1-OV for gcvg-git-2@plane.gmane.org; Tue, 16 Sep 2014 21:41:59 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755107AbaIPTlx (ORCPT ); Tue, 16 Sep 2014 15:41:53 -0400 Received: from alum-mailsec-scanner-2.mit.edu ([18.7.68.13]:60011 "EHLO alum-mailsec-scanner-2.mit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755042AbaIPTlu (ORCPT ); Tue, 16 Sep 2014 15:41:50 -0400 X-AuditID: 1207440d-f797f6d000000a4a-17-541890bb4990 Received: from outgoing-alum.mit.edu (OUTGOING-ALUM.MIT.EDU [18.7.68.33]) by alum-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP id E8.81.02634.BB098145; Tue, 16 Sep 2014 15:34:19 -0400 (EDT) Received: from michael.fritz.box (p5DDB27D9.dip0.t-ipconnect.de [93.219.39.217]) (authenticated bits=0) (User authenticated as mhagger@ALUM.MIT.EDU) by outgoing-alum.mit.edu (8.13.8/8.12.4) with ESMTP id s8GJYBc7001163 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Tue, 16 Sep 2014 15:34:18 -0400 X-Mailer: git-send-email 2.1.0 In-Reply-To: <1410896036-12750-1-git-send-email-mhagger@alum.mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpkleLIzCtJLcpLzFFi42IRYndR1N09QSLE4MdmKYuuK91MFg29V5gt nsy9y2xxe8V8ZosfLT3MFv8m1Fh0dnxldGD3+Pv+A5PHgk2lHg9fdbF7POvdw+hx8ZKyx+dN ch63n21jCWCP4rZJSiwpC85Mz9O3S+DOuLrsDlvBFZaKww/esjYw3mfuYuTkkBAwkXjyaj4L hC0mceHeerYuRi4OIYHLjBKXNzZAOSeYJCb9OMAGUsUmoCuxqKeZCSQhItDGKLHr4mZWEIdZ oJtR4v2J00wgVcICgRJLT3xjBLFZBFQlXi36CNbNK+AicXfGU3aIfXISG3b/B6rh4OAUcJX4 uq8AxBQCKjl4128CI+8CRoZVjHKJOaW5urmJmTnFqcm6xcmJeXmpRbpGermZJXqpKaWbGCGB x7uD8f86mUOMAhyMSjy8Ho/EQ4RYE8uKK3MPMUpyMCmJ8v7rlggR4kvKT6nMSCzOiC8qzUkt PsQowcGsJML7wxcox5uSWFmVWpQPk5LmYFES51Vbou4nJJCeWJKanZpakFoEk5Xh4FCS4OUD RpiQYFFqempFWmZOCUKaiYMTZDiXlEhxal5KalFiaUlGPCg24ouB0QGS4gHa+7EfZG9xQWIu UBSi9RSjMUdL09teJo51nd/6mYRY8vLzUqXEeW1ASgVASjNK8+AWwVLOK0ZxoL+Fed+BVPEA 0xXcvFdAq5iAVp3tEQNZVZKIkJJqYGxSjlmcfNtTW8TxcmSt3funlvd3XIwpsFeW/Ol1NjVL /rDz82/Gr/4HW+saT52zWn374Zl25wIOGi+5/17p3UTVuk4Btv8yRTVbzzy9umvK Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: It is only necessary to clear the lock_file's filename field if it was not already clear. Signed-off-by: Michael Haggerty Reviewed-by: Ronnie Sahlberg --- lockfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lockfile.c b/lockfile.c index f1ce154..a548e08 100644 --- a/lockfile.c +++ b/lockfile.c @@ -276,6 +276,6 @@ void rollback_lock_file(struct lock_file *lk) if (lk->fd >= 0) close(lk->fd); unlink_or_warn(lk->filename); + lk->filename[0] = 0; } - lk->filename[0] = 0; } -- 2.1.0