From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7A37C4116B for ; Tue, 13 Sep 2022 19:51:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF86568B965; Tue, 13 Sep 2022 22:51:32 +0300 (EEST) Received: from mail-yw1-f176.google.com (mail-yw1-f176.google.com [209.85.128.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC79468B965 for ; Tue, 13 Sep 2022 22:51:25 +0300 (EEST) Received: by mail-yw1-f176.google.com with SMTP id 00721157ae682-3378303138bso153679407b3.9 for ; Tue, 13 Sep 2022 12:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date; bh=vPvSbF3iFc75eY4ZT/kQj0uiRPXfYtStekMqcz/vstU=; b=fcJ/oDremYDH839pq5b7DEAkBCdx2WptJHtlqJ1D6SoBwRHbs+BPGhwYfZr1er5vPj wsocm2NkIjXwuOPs9JwOw0/6CXVaSkW24isMzB8usvNOH1XaDIA6vG4OQ7ihIFt6OLPr oCBEKwdGftjot0gHEeWD51AWw3vjNbYdGkuCGBov2zP2ff91FAo7BTUn9oExTXVV53lZ ysd/gNybO6dftw97dT9dP43AQcK7l+U3D+GI1b0r74JLSs2FDXnap3RBN89vXiFOcBsj ZTCHYvA4BVzHxDpviEHxjbAAoR6jXbl551KODJjy8o/asbSxkcXyUz2AMUUpP2+8tEkK 6rZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=vPvSbF3iFc75eY4ZT/kQj0uiRPXfYtStekMqcz/vstU=; b=PNj6p1jZDNJUTjS7qgJTlamOthH4hgdZ/Uz53Md6yqMTZKI/PAg1NcAUc0LDJYfY5L b4AaJ4BuhU506raBter2P/8LRSukPgn0RQn3nc3bsx/Reu322snyMOtbpc5Ky++MPs47 at+4ku4EfMWL+m+qoECpt/qPZh3ZEXI+crZ+4OOhKEcFlZ1Cpi/lYwV9t4g9sWL1j0rI /K7xFtHqIi4tX3zLHkY08aNbZBZzEJPTf9VKQ6CmApvLSSz6l6iKj+HVscOn3LMnDWvF Dxj0sau/Z7fOi30K6SLX8yyDZm6FTzAiNEBR369m56g30FnnjN2Jwr8ahHtLC8tMv49R d3WQ== X-Gm-Message-State: ACgBeo3stvet2PDeWOghJA8aPvhr6MaV/F7ZtSCKNoOXRtJwRHZraPvA bPFkX7CTHdAqZwbw66PWGMd/NNn9bvCSbqFMFrjuKIHG X-Google-Smtp-Source: AA6agR5tIG/Hf3z4j5yT95VmInEShlj543h+FoFCYvAoUXnnF0255J+7cTAz9A1qFhXs8Uwq3/A8+9CtLCEXw/I7j3A= X-Received: by 2002:a0d:ccc7:0:b0:345:5848:5feb with SMTP id o190-20020a0dccc7000000b0034558485febmr26889667ywd.302.1663098684266; Tue, 13 Sep 2022 12:51:24 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a81:7402:0:0:0:0:0 with HTTP; Tue, 13 Sep 2022 12:51:23 -0700 (PDT) In-Reply-To: References: From: Paul B Mahol Date: Tue, 13 Sep 2022 21:51:23 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH 3/3] avutil/dict: Avoid check whose result is known in advance X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 9/13/22, Andreas Rheinhardt wrote: > We know that an AVDictionary is not empty if we have just added > an entry to it, so only check for it being empty on the branch > that does not do so. > > Signed-off-by: Andreas Rheinhardt > --- > libavutil/dict.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > LGTM > diff --git a/libavutil/dict.c b/libavutil/dict.c > index 1968063b0b..4bba041d0a 100644 > --- a/libavutil/dict.c > +++ b/libavutil/dict.c > @@ -123,12 +123,12 @@ int av_dict_set(AVDictionary **pm, const char *key, > const char *value, > m->elems[m->count].value = copy_value; > m->count++; > } else { > + if (!m->count) { > + av_freep(&m->elems); > + av_freep(pm); > + } > av_freep(©_key); > } > - if (!m->count) { > - av_freep(&m->elems); > - av_freep(pm); > - } > > return 0; > > -- > 2.34.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".