From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-6.0 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id C5D761F437 for ; Sat, 28 Jan 2017 22:03:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752261AbdA1WDp (ORCPT ); Sat, 28 Jan 2017 17:03:45 -0500 Received: from mout.web.de ([212.227.15.14]:63668 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752114AbdA1WDn (ORCPT ); Sat, 28 Jan 2017 17:03:43 -0500 Received: from [192.168.178.36] ([79.237.55.102]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0Llncm-1byXO30u6i-00ZPra; Sat, 28 Jan 2017 23:03:19 +0100 X-Mozilla-News-Host: news://news.public-inbox.org:119 To: Git List Cc: Junio C Hamano , "brian m. carlson" From: =?UTF-8?Q?Ren=c3=a9_Scharfe?= Subject: [PATCH] use oidcpy() for copying hashes between instances of struct object_id Message-ID: <27a55499-82e7-df77-99bc-62fe76c31a86@web.de> Date: Sat, 28 Jan 2017 23:03:06 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:bKQgeuHb/JoNV0QpdZoHJd+bHOa2NDDvLLZNbvzTr9BD9V1tKnH XU0H0C1BcTtW7hllEDkF2B6+5/Yn839UThvpaMLcnKJOpAswANugqEXQ58PxJiMo19Z9jTL 4e/PUd28yl/WMgILIzVplxfjGNHt7LyF8q+GuMFeYR15CL/jpW//d1A0ZBqjdYEHyU/1oIv pmrpIMYC3Pr75gFV0L8Ow== X-UI-Out-Filterresults: notjunk:1;V01:K0:dvcQYzaYyuE=:66KfmJfGvXG+Gint/c7Pmg g0O6OTrFadP9BbUH7psUDHmOtW2u887lCLzhtLv7IC5GT5hn7Vn4I11MI3p6yl1u1LsRfnZvH TI0wRGBpoHwqwpIbPs6jvYYlffqE6W1ZNooaiKjhVKecnOpG3skxaLNrfbCHLDsgJqEYb/8tv 8FYuKKaYS2A+TFcVb8IrQ3u7Fsgo8kKmNakvl7kxi0q0n/bCAvZTB0FpT4LIPz1ml5ObVfAS8 wy9yDbTsGyJr6cg479FriGQlT5V0VdniJpZ4w0W6WKQ9N2el+SF3xywlUaQdAa1fPVPActluv 7Z1YHQYu3Mq1e0dRof9f/W4MgJw+nXRHCsG8sDDdKqFBig/juZp1q4R4HDAZPEjXgTqXbXst/ IryBca9bsigpOo6HyrBCfpNHH8pceWWssjrbIoVvMsrPYSET+PjKMC3eps0mveeRzSb6kBAT9 J/QYkP8imew1WLDCeG3lvYX5Cm4ef7i5T0nhDH0iEnIZulJvpzdbay0qiJn2Y977UBKzrKROZ +LGxCYDkZST6aSCoH8RtZ0+QOuWk2T/WCQU4spkl5SrGijBvbr5nHE5b0ScnKIx4VOg9P5Cul /XRiAmsX9h4L66RqtK/k892+kyrELqV1cftCl4aSW2Dt+2RAmymU7wJZbTQTyMftn9LdS1nv5 Lg8EgdA7c0gkrGJibhtquq940u5Wj80VE0pnvTkJlfD0GKiPOhF0OmnO9e4+K7u2CQft4xAtN Px8XNyFKtLqpZfCMTxHxq2DR4K8SzaIX8WpNbYJHExUAhIPZIrxM4iMT7RBgkHq0KMuJxz7li bQnTMti Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Patch generated by Coccinelle and contrib/coccinelle/object_id.cocci. Signed-off-by: Rene Scharfe --- refs/files-backend.c | 2 +- wt-status.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index f9023939d5..8ee2aba39f 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -697,7 +697,7 @@ static int cache_ref_iterator_peel(struct ref_iterator *ref_iterator, if (peel_entry(entry, 0)) return -1; - hashcpy(peeled->hash, entry->u.value.peeled.hash); + oidcpy(peeled, &entry->u.value.peeled); return 0; } diff --git a/wt-status.c b/wt-status.c index a715e71906..a05328dc48 100644 --- a/wt-status.c +++ b/wt-status.c @@ -628,7 +628,7 @@ static void wt_status_collect_changes_initial(struct wt_status *s) d->index_status = DIFF_STATUS_ADDED; /* Leave {mode,oid}_head zero for adds. */ d->mode_index = ce->ce_mode; - hashcpy(d->oid_index.hash, ce->oid.hash); + oidcpy(&d->oid_index, &ce->oid); } } } @@ -2096,7 +2096,7 @@ static void wt_porcelain_v2_print_unmerged_entry( if (strcmp(ce->name, it->string) || !stage) break; stages[stage - 1].mode = ce->ce_mode; - hashcpy(stages[stage - 1].oid.hash, ce->oid.hash); + oidcpy(&stages[stage - 1].oid, &ce->oid); sum |= (1 << (stage - 1)); } if (sum != d->stagemask) -- 2.11.0