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 495794480B for ; Sat, 26 Nov 2022 14:43:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B4B768B95E; Sat, 26 Nov 2022 16:43:00 +0200 (EET) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F75668AF9F for ; Sat, 26 Nov 2022 16:42:54 +0200 (EET) Received: by mail-ej1-f45.google.com with SMTP id ud5so16082366ejc.4 for ; Sat, 26 Nov 2022 06:42:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:message-id:date:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=MXEq5Yv5iDgGlkOe42DosEYJs6rAwFKNysEvLwJ9Cp4=; b=Ao111vn/A99ZNGrRTyD9z36IwZX4z1Ij/sBF8vqDH6cRrduQqDVFIJ7KbJ8Zn1/cIy qfE+zjppIqwIN59cLhDeUHHpVRLMD5FPdMgx/rSjyzSr3FpUMSQim+eGI3FHAU4nZ7n0 9EardDxd9YBLPjuBe+OQ4i22qdz9NJ+QXeqlT3Fvax/Jui/c7hF3PxxdGE6e7X0fo0LI H1MkNW0yA3WGn3aNVlbaHMbRrx/YAK5uzK5wfqLo1ZmrqtFr65lw62KxT9lGLfQvVaIe LE5PHw5MuIdXRF7lTaeXYbux5JPN0kYv6VdJL1hSmtgE+CAvP5pBsfYFADdfraItHzei La+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:references:in-reply-to:message-id:date:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MXEq5Yv5iDgGlkOe42DosEYJs6rAwFKNysEvLwJ9Cp4=; b=mUgXfplA++oTndiZIqaoeMtVzlb4uoAlLWyblpv06F4dvfHxR01TwbVAdQfNdAC7EZ M745Q30e/0ITEa+Bx1uUv/FAB2vCh/8GOz1cbB/E+P18y0zGqVRWRW+R5fjpLLU6yu0y nloEUedX1KUDoxJFShcBe+sqK0NaLNG3+mk/ytO3tetxkgKBeI0qOSOEJXmaBv6HYxEE 8FCuiAxHcw2MIC4Z7YZJKV9XAm7cLcyyPZw4RKKXq3mp7KFxmuwgDee8vnbnrrKgAbh5 fPMKLGbKF7R4O1P2ugFNbHC7RSshTLEDVM9wGvhKSSkFIwZW80B9MfkyFMTIVocbzWva FPoA== X-Gm-Message-State: ANoB5pnqm1aCyMiZKz9/hKllqfRWTCStOnK6Fi9hy9CDsAGLU356z/bw j3eVu99nJPqlgPZCXy5/iIRADdgGUXY= X-Google-Smtp-Source: AA0mqf5jWixq0doLq9n3OfEgSzHwU1VjrpMYY4h2UMPRf+L7L8Ydl5it5rqPPz5lv2Sd0BpXxo3FLg== X-Received: by 2002:a17:906:1d14:b0:7ad:79c0:46f4 with SMTP id n20-20020a1709061d1400b007ad79c046f4mr36267411ejh.363.1669473773382; Sat, 26 Nov 2022 06:42:53 -0800 (PST) Received: from [192.168.1.104] (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id n6-20020aa7db46000000b0046aa2a36954sm2632190edt.97.2022.11.26.06.42.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Nov 2022 06:42:52 -0800 (PST) From: Marvin Scholz To: FFmpeg development discussions and patches Date: Sat, 26 Nov 2022 15:42:51 +0100 X-Mailer: MailMate (1.14r5898) Message-ID: <4741D7B7-1FD9-401F-81FD-C5E5AB05EDBF@gmail.com> In-Reply-To: References: <20221125013046.40904-1-epirat07@gmail.com> <20221125013046.40904-8-epirat07@gmail.com> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 07/31] avutil: use av_dict_iterate 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 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 25 Nov 2022, at 13:50, Andreas Rheinhardt wrote: > Marvin Scholz: >> --- >> libavutil/opt.c | 12 ++++++------ >> libavutil/tests/dict.c | 10 +++++----- >> 2 files changed, 11 insertions(+), 11 deletions(-) >> >> diff --git a/libavutil/opt.c b/libavutil/opt.c >> index a3940f47fb..0a909a8b22 100644 >> --- a/libavutil/opt.c >> +++ b/libavutil/opt.c >> @@ -1742,14 +1742,14 @@ void av_opt_free(void *obj) >> >> int av_opt_set_dict2(void *obj, AVDictionary **options, int search_flags) >> { >> - AVDictionaryEntry *t = NULL; >> + const AVDictionaryEntry *t = NULL; >> AVDictionary *tmp = NULL; >> int ret; >> >> if (!options) >> return 0; >> >> - while ((t = av_dict_get(*options, "", t, AV_DICT_IGNORE_SUFFIX))) { >> + while ((t = av_dict_iterate(*options, t))) { >> ret = av_opt_set(obj, t->key, t->value, search_flags); >> if (ret == AVERROR_OPTION_NOT_FOUND) >> ret = av_dict_set(&tmp, t->key, t->value, 0); >> @@ -2137,16 +2137,16 @@ FF_ENABLE_DEPRECATION_WARNINGS >> case AV_OPT_TYPE_DICT: { >> AVDictionary *dict1 = NULL; >> AVDictionary *dict2 = *(AVDictionary **)dst; >> - AVDictionaryEntry *en1 = NULL; >> - AVDictionaryEntry *en2 = NULL; >> + const AVDictionaryEntry *en1 = NULL; >> + const AVDictionaryEntry *en2 = NULL; >> ret = av_dict_parse_string(&dict1, o->default_val.str, "=", ":", 0); >> if (ret < 0) { >> av_dict_free(&dict1); >> return ret; >> } >> do { >> - en1 = av_dict_get(dict1, "", en1, AV_DICT_IGNORE_SUFFIX); >> - en2 = av_dict_get(dict2, "", en2, AV_DICT_IGNORE_SUFFIX); >> + en1 = av_dict_iterate(dict1, en1); >> + en2 = av_dict_iterate(dict2, en2); >> } while (en1 && en2 && !strcmp(en1->key, en2->key) && !strcmp(en1->value, en2->value)); >> av_dict_free(&dict1); >> return (!en1 && !en2); >> diff --git a/libavutil/tests/dict.c b/libavutil/tests/dict.c >> index d053545f4d..8c05752ea7 100644 >> --- a/libavutil/tests/dict.c >> +++ b/libavutil/tests/dict.c >> @@ -22,8 +22,8 @@ >> >> static void print_dict(const AVDictionary *m) >> { >> - AVDictionaryEntry *t = NULL; >> - while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) >> + const AVDictionaryEntry *t = NULL; >> + while ((t = av_dict_iterate(m, t))) >> printf("%s %s ", t->key, t->value); >> printf("\n"); >> } >> @@ -94,7 +94,7 @@ int main(void) >> if (av_dict_get(dict, NULL, NULL, 0)) >> printf("av_dict_get() does not correctly handle NULL key.\n"); >> e = NULL; >> - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) >> + while ((e = av_dict_iterate(dict, e))) >> printf("%s %s\n", e->key, e->value); >> av_dict_free(&dict); >> >> @@ -106,7 +106,7 @@ int main(void) >> printf("av_dict_set does not correctly handle NULL key\n"); >> >> e = NULL; >> - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) >> + while ((e = av_dict_iterate(dict, e))) >> printf("'%s' '%s'\n", e->key, e->value); >> av_dict_free(&dict); >> >> @@ -122,7 +122,7 @@ int main(void) >> av_dict_set_int(&dict, "12", 1, 0); >> av_dict_set_int(&dict, "12", 2, AV_DICT_APPEND); >> e = NULL; >> - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) >> + while ((e = av_dict_iterate(dict, e))) >> printf("%s %s\n", e->key, e->value); >> av_dict_free(&dict); >> > > This stops testing the old iterating pattern; instead it should > explicitly test that both patterns coincide. > Ok, I've removed this change for now from the pachset as adding tests is not really what this patchset is about. Additionally I do not fully understand how the testing works yet so I don't know how I could write such a test. > - Andreas > > _______________________________________________ > 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".