From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ronnie Sahlberg Subject: [PATCH v20 01/48] refs.c: remove ref_transaction_rollback Date: Fri, 20 Jun 2014 07:42:42 -0700 Message-ID: <1403275409-28173-2-git-send-email-sahlberg@google.com> References: <1403275409-28173-1-git-send-email-sahlberg@google.com> Cc: Ronnie Sahlberg To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Jun 20 16:44:11 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 1Wy02x-0001No-AU for gcvg-git-2@plane.gmane.org; Fri, 20 Jun 2014 16:44:07 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753482AbaFTOnm (ORCPT ); Fri, 20 Jun 2014 10:43:42 -0400 Received: from mail-qc0-f202.google.com ([209.85.216.202]:60644 "EHLO mail-qc0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753128AbaFTOnd (ORCPT ); Fri, 20 Jun 2014 10:43:33 -0400 Received: by mail-qc0-f202.google.com with SMTP id x13so506929qcv.1 for ; Fri, 20 Jun 2014 07:43:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2mGWQXVGUZ8yn8cS+opOzUPk0QIjwI+wT8vWBPrCONQ=; b=WQPJAi16SlzZx6U+jk+ltmZdQVcGQcFjwb0YOYRHFjDLALBh5SkjcH5SqRMz3QWoIG pu9gcc810I0gZixi7vfjxt8CKcjqvKuS3ebAtGH9ctpHaud1/pKlYjZPj8nWo6ypkVrR RrXrRCNC9czsG/YFSqkJY1faFBzVzoEsQaiUpJ+poOwGBczXtJL29eOyT9782mKgFAk0 hEQEsUGGsgR0gUe9SckKkbajL8eXSp8Uh13+gNHv6d56p03QlbY2EMkEGxmD2AlnKbEp fOlvfb6az4ZMj3ZrhnYiWOS+9/VSClX/JUAcMm6nuBV/5/z+pKlOqJlQzmj4m1acVipz z/Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2mGWQXVGUZ8yn8cS+opOzUPk0QIjwI+wT8vWBPrCONQ=; b=NHCq4/gyvr66loVA8AzG55mkgkY4a9WT+/65AgnWPkPvS7wYSV63Ph62TSyN8Gr+E2 bZen8a7DE9Nz2MoBmAHoZX9QSvJfqMrDS2em1H+enC0tmULS9PpFld7cLK+Z00iIFhyu IvbRPw63vtw+wcprsaU9i8jPQQbQQHBS50bQzngqoOtD9JT/deIC28DYHd7eTlpYw2bk qj3JFPQgD4fAYKQDG0iRvtoAb81PflXW7FU85tOj4yooNp/Gkpvvb5g8Lr9IDXC8bxLD UkR/KRUAeUzb1PWLSUGK+0fFG3qZCtmTb6ZDnhPO3czsQzu++ThVokOBG6hXmBy1238L MGzg== X-Gm-Message-State: ALoCoQlSWVNh+snapKUdVleSQd7/mhqZQKaazLrl8qT/RN2nyCPUP4A2GbRug5VQWhfOzVKi2wLd X-Received: by 10.224.171.130 with SMTP id h2mr1480970qaz.7.1403275412023; Fri, 20 Jun 2014 07:43:32 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id c50si663232yhl.7.2014.06.20.07.43.32 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Jun 2014 07:43:32 -0700 (PDT) Received: from sahlberg1.mtv.corp.google.com (sahlberg1.mtv.corp.google.com [172.27.69.52]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id DB0375A40F4; Fri, 20 Jun 2014 07:43:31 -0700 (PDT) Received: by sahlberg1.mtv.corp.google.com (Postfix, from userid 177442) id 8574AE08AF; Fri, 20 Jun 2014 07:43:31 -0700 (PDT) X-Mailer: git-send-email 2.0.0.420.g181e020.dirty In-Reply-To: <1403275409-28173-1-git-send-email-sahlberg@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: We do not yet need both a rollback and a free function for transactions. Remove ref_transaction_rollback and use ref_transaction_free instead. At a later stage we may reintroduce a rollback function if we want to start adding reusable transactions and similar. Reviewed-by: Jonathan Nieder Signed-off-by: Ronnie Sahlberg --- refs.c | 7 +------ refs.h | 16 +++++++--------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/refs.c b/refs.c index dc45774..6d841a0 100644 --- a/refs.c +++ b/refs.c @@ -3334,7 +3334,7 @@ struct ref_transaction *ref_transaction_begin(void) return xcalloc(1, sizeof(struct ref_transaction)); } -static void ref_transaction_free(struct ref_transaction *transaction) +void ref_transaction_free(struct ref_transaction *transaction) { int i; @@ -3345,11 +3345,6 @@ static void ref_transaction_free(struct ref_transaction *transaction) free(transaction); } -void ref_transaction_rollback(struct ref_transaction *transaction) -{ - ref_transaction_free(transaction); -} - static struct ref_update *add_update(struct ref_transaction *transaction, const char *refname) { diff --git a/refs.h b/refs.h index 4e3050d..cfd1832 100644 --- a/refs.h +++ b/refs.h @@ -219,18 +219,12 @@ enum action_on_err { /* * Begin a reference transaction. The reference transaction must - * eventually be commited using ref_transaction_commit() or rolled - * back using ref_transaction_rollback(). + * eventually be commited using ref_transaction_commit() or freed by + * calling ref_transaction_free(). */ struct ref_transaction *ref_transaction_begin(void); /* - * Roll back a ref_transaction and free all associated data. - */ -void ref_transaction_rollback(struct ref_transaction *transaction); - - -/* * The following functions add a reference check or update to a * ref_transaction. In all of them, refname is the name of the * reference to be affected. The functions make internal copies of @@ -238,7 +232,6 @@ void ref_transaction_rollback(struct ref_transaction *transaction); * can be REF_NODEREF; it is passed to update_ref_lock(). */ - /* * Add a reference update to transaction. new_sha1 is the value that * the reference should have after the update, or zeros if it should @@ -280,6 +273,11 @@ void ref_transaction_delete(struct ref_transaction *transaction, int ref_transaction_commit(struct ref_transaction *transaction, const char *msg, enum action_on_err onerr); +/* + * Free an existing transaction and all associated data. + */ +void ref_transaction_free(struct ref_transaction *transaction); + /** Lock a ref and then write its file */ int update_ref(const char *action, const char *refname, const unsigned char *sha1, const unsigned char *oldval, -- 2.0.0.420.g181e020.dirty