From patchwork Fri Nov 25 01:30:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39436 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4950112pzb; Thu, 24 Nov 2022 17:35:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf6KhcARiEB0B3d970FGj4UkBftid8XKTVd7dktR8270VgL9QPOvrNCM2dSSZvbxorX3I2Xn X-Received: by 2002:a05:6402:456:b0:461:9955:b54a with SMTP id p22-20020a056402045600b004619955b54amr21284262edw.159.1669340105411; Thu, 24 Nov 2022 17:35:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340105; cv=none; d=google.com; s=arc-20160816; b=C5Bxks7F2yUm5KKjXhbWvhfPvq0539zCrkfmrdbDdQLfaCuroMR3kTuuOwfdLKGoOc rsYzEAWdWcFxFxbuCZELqFwXyA3EuEvAwXmCIxHj3JQB6EuGdc+qOdbOy3LauAhWbk4u ottWFui3zLOE/wEdidPj6MZJKUIkuSl1y7qHyr5/OLRDqJ9DahSUZUf5HGinWS+UHAr1 CPSJT8tSAElluq2rUvxHgbqtzURYvSLNqTbdZUqZVLdwJuJq4/KZ+wh6UpxGGMLjW+2d xN+pcFR57JyjBc4aIGFQxr+iEUkET2d/XHKw9I/EP2Z1a6Ktdt7pC5FOJTAyowSdFCao sbNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=fQjJp3ALL7HOHs7uVksFKOXvCfpgjS9QdYpXTQM9cOs=; b=floTZOYmRbd3W/8Q+NLQeb35LyURfyIuMg+CWHJFBueC7XzejM6BPPqQ9v8H2gZ36H /tbUPU2hgflr6MEsPOhPb4q2ND53bZ2tIV2uAWTR7RvNGt+X3nhQgauEdSV8hOdWnVtJ I7LBhBBd+uf/SkF2Bh8MCD6Cya1RJ86biCL/xJb3VojAUHWEjCDed/p67N6+9NYYg+Pk O6hVgeAqyFZn6Ql6YZ3QAOg2xgdHUKu4NyKDn/pxFRKLeE60oQM2hcdx+jIqtn8quAwY QgalhUjmZwpDa1jBAIsyuQEhNWx5Y0m9BkBdvOdyqMcmBoLm6K4vqP6EmJ+Hlm/cYgyZ 3ivg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oVBz6h87; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gn13-20020a1709070d0d00b007824786a7easi2275581ejc.724.2022.11.24.17.35.05; Thu, 24 Nov 2022 17:35:05 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oVBz6h87; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 401C268BCBE; Fri, 25 Nov 2022 03:31:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8811068BC38 for ; Fri, 25 Nov 2022 03:31:15 +0200 (EET) Received: by mail-ed1-f51.google.com with SMTP id b8so4471378edf.11 for ; Thu, 24 Nov 2022 17:31:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W7yoqjrBB+ge8dqCjWZzJBbZ8Tp+v6XEVEhqmUELwho=; b=oVBz6h87ZsHymSCrvm/M4Pqws5rO92ld1cDRJHt7liU4j3mtImcN44Qn8ycVOXoqVE /qFc9YhrZes2RYmpPdNvh3E3FVBfuChrNl21gH0V9IytMIMn0TdiLjatUHF28DblDnhf +Tbdlk9ibffmYCwQ7hKYQESMsiSk10LAQuDeXOUQXIxtGRS6LWuPD4kcfSC3F5axVx// GXynIcZdnnF3qlhU4IQpsGkosIDiaxO9c4sNFSCp+hUQUKyrcw+2YjqnF9yP9x4hBAAP fWlr3+ZqH9bnl7e7OCR3pc4fI/oucr2uvvqzVV9dURhpq3qiSs6/MsOMWNORs0p1tdgl rY/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W7yoqjrBB+ge8dqCjWZzJBbZ8Tp+v6XEVEhqmUELwho=; b=nCmDU8GhgIdRAwlUJebMLpTrfXX1zb20caK+YOHJnYpME0NkeSFdIh8Yt9NXPPyl1I KISbiKNOI0FHIk6BgcdiKLjtDGKgPJESB2c/Z2fbysDbMwzwL1HxQ0juNDB7+ZW8CsWE mm4sH1o8sa3djdIDvrrSAau7UiA/8TTJANckGjyeHbhHKiZ6UsL6nAk6E2I8I44HPO7Y ihi42/mwV8i45M3vAF75BI43XAKmMR8+6Z8OpDVzvgtiZMDVknXiPsJAcDTG2aaGcAlH pGtCxuZr0MDeC/yP18XW0Ohx5ScoyGnXI1Ht88+y62irS4tJwVR76urnq2RFHpqqkkZ+ 4iJg== X-Gm-Message-State: ANoB5pnndapQ2NUcb5VdYL+SfuTQJLMnAKthV+RM/TXdLul4pZFtaIwq IxNWgyxKYxJId39pbfKEjwwGjFlcxT4= X-Received: by 2002:a05:6402:1772:b0:46a:7f4d:efe5 with SMTP id da18-20020a056402177200b0046a7f4defe5mr5516455edb.304.1669339875167; Thu, 24 Nov 2022 17:31:15 -0800 (PST) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:14 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:44 +0100 Message-Id: <20221125013046.40904-30-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 29/31] avformat/http: 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 Cc: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: W8PxzZXm45bx --- libavformat/http.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index c5c48c7900..7bce821535 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1021,11 +1021,11 @@ static int parse_cookie(HTTPContext *s, const char *p, AVDictionary **cookies) static int cookie_string(AVDictionary *dict, char **cookies) { - AVDictionaryEntry *e = NULL; + const AVDictionaryEntry *e = NULL; int len = 1; // determine how much memory is needed for the cookies string - while (e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX)) + while ((e = av_dict_iterate(dict, e))) len += strlen(e->key) + strlen(e->value) + 1; // reallocate the cookies @@ -1036,7 +1036,7 @@ static int cookie_string(AVDictionary *dict, char **cookies) *cookies[0] = '\0'; // write out the cookies - while (e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX)) + while ((e = av_dict_iterate(dict, e))) av_strlcatf(*cookies, len, "%s%s\n", e->key, e->value); return 0;