From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ronnie Sahlberg Subject: [PATCH v19 19/48] refs.c: change ref_transaction_update() to do error checking and return status Date: Thu, 19 Jun 2014 08:53:01 -0700 Message-ID: <1403193210-6028-20-git-send-email-sahlberg@google.com> References: <1403193210-6028-1-git-send-email-sahlberg@google.com> Cc: Ronnie Sahlberg To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Jun 19 17:56:17 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 1Wxeh4-0000VH-4N for gcvg-git-2@plane.gmane.org; Thu, 19 Jun 2014 17:56:06 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757961AbaFSPzy (ORCPT ); Thu, 19 Jun 2014 11:55:54 -0400 Received: from mail-pa0-f73.google.com ([209.85.220.73]:34551 "EHLO mail-pa0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757797AbaFSPxe (ORCPT ); Thu, 19 Jun 2014 11:53:34 -0400 Received: by mail-pa0-f73.google.com with SMTP id kq14so295111pab.4 for ; Thu, 19 Jun 2014 08:53:33 -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=JkYVaqjVdFVHa+XS+9OZvRANAaqDDMFnzm+f6WncoRY=; b=YET/BfNX8yeEk2/K3/2PUl8bPRCl5Sn2rqOmo47galuWuEefg117cSM6xGVivf5lgO ZJ1jLaN22K/nOBrPBddr7JMEiMcAYyi3bE7cZfocnICr0j22sq92MglUY9hT96fzez4C WW9XuCSJaL5jG7/dKliKDuP5LGHPKo7TscMa4FcaJ2b1scq3z5xH6kOkyTyl+penR8dB rHIFNUNfId6jc0TA23lmJykI/1TZzPncXT28BwXr4R7oCGwyAUkJbjJM5TjqptuyMLg9 I2GsnPX9mLWj442AmFsXhElthnl6ZVm2Gb05LRxsTJv2lqg8K1g58onjCAJXYQnqvpU4 iiEQ== 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=JkYVaqjVdFVHa+XS+9OZvRANAaqDDMFnzm+f6WncoRY=; b=hW3c/VTQVb/jbAKVnjsvg5MnDSvyjlBVd4FuTHc9ZO4+vX61d6/A9RrYl3OAr99LFI aG19OTZFEutFoKl0Q24E15SD8ymLYeY5knH0IKOAIBsgmBQe7dAdJyISicc7deXuDtwT a+yoWWG8qRXirnVJ4/S8UJ9jqESmUeQswBA+Y1wxudACTOwcKfT93x+2IMew8YsUTruU +bhBfUJ56ulMHhw37rY34iDrC5aGTw6SEYIz363Co0IqPrs5yuh5EY0JHZGLviSFj4pW fA5G9/82rJLaKZzhfw+K7L9IIQ7RmK7prRyG9OFUUn/3puePlX61bMh6q6pr8HUePEqp TC+A== X-Gm-Message-State: ALoCoQlyKmJHEJSvSgh7bQ9UCJZmGWYSYe7roLB71xzRwxMgrTwl3Xi42HcdeQYUov6MFKnJiEnh X-Received: by 10.67.4.202 with SMTP id cg10mr2691117pad.42.1403193213519; Thu, 19 Jun 2014 08:53:33 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id v12si347086yhe.2.2014.06.19.08.53.33 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Jun 2014 08:53:33 -0700 (PDT) Received: from sahlberg1.mtv.corp.google.com (sahlberg1.mtv.corp.google.com [172.27.69.52]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 4A39E31C3A6; Thu, 19 Jun 2014 08:53:33 -0700 (PDT) Received: by sahlberg1.mtv.corp.google.com (Postfix, from userid 177442) id 14D86E0B50; Thu, 19 Jun 2014 08:53:32 -0700 (PDT) X-Mailer: git-send-email 2.0.0.438.g337c581 In-Reply-To: <1403193210-6028-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 4f78bd9..3f05e88 100644 --- a/refs.c +++ b/refs.c @@ -3428,19 +3428,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 163b45c..c5376ce 100644 --- a/refs.h +++ b/refs.h @@ -246,12 +246,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.438.g337c581