From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ronnie Sahlberg Subject: [PATCH v14 12/40] refs.c: change ref_transaction_update() to do error checking and return status Date: Fri, 6 Jun 2014 15:28:50 -0700 Message-ID: <1402093758-3162-13-git-send-email-sahlberg@google.com> References: <1402093758-3162-1-git-send-email-sahlberg@google.com> Cc: Ronnie Sahlberg To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Jun 07 00:29:42 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 1Wt2dm-0002Hb-Kg for gcvg-git-2@plane.gmane.org; Sat, 07 Jun 2014 00:29:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752598AbaFFW3f (ORCPT ); Fri, 6 Jun 2014 18:29:35 -0400 Received: from mail-ob0-f202.google.com ([209.85.214.202]:60213 "EHLO mail-ob0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752472AbaFFW3W (ORCPT ); Fri, 6 Jun 2014 18:29:22 -0400 Received: by mail-ob0-f202.google.com with SMTP id wm4so742272obc.3 for ; Fri, 06 Jun 2014 15:29:22 -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=3TFpNef77MfeykoEKPxt8w1JsXdZ2Y/VaCc6VX5Q718=; b=gNlyk1lIut47mFrMSbAptziGeuv4xR+uLX+JE0iBde4JAz0KGIuGhIddFu/KeaO9Pi 83m1g28WuiRl0SY41PqU3AKfCK/B+b2mPrDN9zxtGK6wXg3QYtz0wvX9aDQf7DgVOatZ WMYYzNhRmG2JsjdrLwtWTcHcDkGrSFggMBtXCO5A+RTjl5O+vpLAz3z1el3XaWg1xsCS 6U68cKizlj75D9XnFJiZn9FJEK5t+vhmrPfEAMI9uV8TCN6ZCeK/m1uwan94oAszVxKG VihrEQfEgOSb8jm5if5np7bQdsdd4wiilsRGcY9b5E0sQ4Q+8TIygXBPXNOF4Zax3gvs oazA== 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=3TFpNef77MfeykoEKPxt8w1JsXdZ2Y/VaCc6VX5Q718=; b=jnr86WeIUKikiQizgw5GOtt855T4P1NefwmNr7qFwI0ktjtGv2WHpLkKPNyYcjSKhg Tl51uY//KXANyViC7xVKjQ4mE2ToJnwXKexlbvCS9bWkl6tY8krkYyK3M6hcns0Hazz2 tf8hu2gBUZdvwgaCyxCHjTc7WH0DpVu2Lx+NVxr+3yUmJ0KLCJ3IH4QfAfNyyZNLvV9P 2DTVU5tnKRIKkhGsd3uoalMGXD6V2SU7dP3Ou0NNxnNMUcIFtmj+21xOzEl3dM0QRQRL OK1HORciR1ETjELSUO1FaNtMRp6AgokiAD1qPNCuICTWo0DXQWX+Y3DSp3vz/IX8LOkd P4dg== X-Gm-Message-State: ALoCoQlzcx8oAXVbNTlxhQPKw4dD6R0Mv/A+4UYkL/Q3iZdZSD7eYRXqCwr7o5ReaYOhD4h0Xb5d X-Received: by 10.43.94.71 with SMTP id bx7mr4743404icc.2.1402093762350; Fri, 06 Jun 2014 15:29:22 -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 ds6si750432vdb.0.2014.06.06.15.29.22 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Jun 2014 15:29:22 -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 0942F5A44EE; Fri, 6 Jun 2014 15:29:22 -0700 (PDT) Received: by sahlberg1.mtv.corp.google.com (Postfix, from userid 177442) id A77F7E0CFF; Fri, 6 Jun 2014 15:29:21 -0700 (PDT) X-Mailer: git-send-email 2.0.0.582.ge25c160 In-Reply-To: <1402093758-3162-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: Update ref_transaction_update() do some basic error checking and return non-zero on error. Update all callers to check ref_transaction_update() for error. There are currently no conditions in _update that will return error but there will be in the future. Add an err argument that will be updated on failure. In future patches we will start doing both locking and checking for name conflicts in _update instead of _commit at which time this function will start returning errors for these conditions. Also check for BUGs during update and die(BUG:...) if we are calling _update with have_old but the old_sha1 pointer is NULL. Reviewed-by: Jonathan Nieder Signed-off-by: Ronnie Sahlberg --- builtin/update-ref.c | 12 +++++++----- refs.c | 18 ++++++++++++------ refs.h | 14 +++++++++----- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 88ab785..3067b11 100644 --- a/builtin/update-ref.c +++ b/builtin/update-ref.c @@ -16,6 +16,7 @@ static struct ref_transaction *transaction; static char line_termination = '\n'; static int update_flags; +static struct strbuf err = STRBUF_INIT; /* * Parse one whitespace- or NUL-terminated, possibly C-quoted argument @@ -197,8 +198,9 @@ static const char *parse_cmd_update(struct strbuf *input, const char *next) if (*next != line_termination) die("update %s: extra input: %s", refname, next); - ref_transaction_update(transaction, refname, new_sha1, old_sha1, - update_flags, have_old); + if (ref_transaction_update(transaction, refname, new_sha1, old_sha1, + update_flags, have_old, &err)) + die("%s", err.buf); update_flags = 0; free(refname); @@ -286,8 +288,9 @@ static const char *parse_cmd_verify(struct strbuf *input, const char *next) if (*next != line_termination) die("verify %s: extra input: %s", refname, next); - ref_transaction_update(transaction, refname, new_sha1, old_sha1, - update_flags, have_old); + if (ref_transaction_update(transaction, refname, new_sha1, old_sha1, + update_flags, have_old, &err)) + die("%s", err.buf); update_flags = 0; free(refname); @@ -342,7 +345,6 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix) const char *refname, *oldval, *msg = NULL; unsigned char sha1[20], oldsha1[20]; int delete = 0, no_deref = 0, read_stdin = 0, end_null = 0, flags = 0; - struct strbuf err = STRBUF_INIT; struct option options[] = { OPT_STRING( 'm', NULL, &msg, N_("reason"), N_("reason of the update")), OPT_BOOL('d', NULL, &delete, N_("delete the reference")), diff --git a/refs.c b/refs.c index fb44978..f5e7a12 100644 --- a/refs.c +++ b/refs.c @@ -3418,19 +3418,25 @@ static struct ref_update *add_update(struct ref_transaction *transaction, return update; } -void ref_transaction_update(struct ref_transaction *transaction, - const char *refname, - const unsigned char *new_sha1, - const unsigned char *old_sha1, - int flags, int have_old) +int ref_transaction_update(struct ref_transaction *transaction, + const char *refname, + const unsigned char *new_sha1, + const unsigned char *old_sha1, + int flags, int have_old, + struct strbuf *err) { - struct ref_update *update = add_update(transaction, refname); + struct ref_update *update; + + if (have_old && !old_sha1) + die("BUG: have_old is true but old_sha1 is NULL"); + update = add_update(transaction, refname); hashcpy(update->new_sha1, new_sha1); update->flags = flags; update->have_old = have_old; if (have_old) hashcpy(update->old_sha1, old_sha1); + return 0; } void ref_transaction_create(struct ref_transaction *transaction, diff --git a/refs.h b/refs.h index 6ee9c9e..32edf3f 100644 --- a/refs.h +++ b/refs.h @@ -234,12 +234,16 @@ struct ref_transaction *ref_transaction_begin(void); * be deleted. If have_old is true, then old_sha1 holds the value * that the reference should have had before the update, or zeros if * it must not have existed beforehand. + * Function returns 0 on success and non-zero on failure. A failure to update + * means that the transaction as a whole has failed and will need to be + * rolled back. On failure the err buffer will be updated. */ -void ref_transaction_update(struct ref_transaction *transaction, - const char *refname, - const unsigned char *new_sha1, - const unsigned char *old_sha1, - int flags, int have_old); +int ref_transaction_update(struct ref_transaction *transaction, + const char *refname, + const unsigned char *new_sha1, + const unsigned char *old_sha1, + int flags, int have_old, + struct strbuf *err); /* * Add a reference creation to transaction. new_sha1 is the value -- 2.0.0.582.ge25c160