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 ESMTPS id C9DD449CC1 for ; Thu, 30 Jan 2025 00:26:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2CD9268BC9D; Thu, 30 Jan 2025 02:26:18 +0200 (EET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3570268BB78 for ; Thu, 30 Jan 2025 02:26:11 +0200 (EET) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4362bae4d7dso1168875e9.1 for ; Wed, 29 Jan 2025 16:26:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738196770; x=1738801570; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IGX0peuCCKC2MmBCZ5G6iq9o+EUJCgijgmql/75PQmQ=; b=BjbG3iNjdB6cJ0S/ISf7Krp74ft4expwx9GPVON5rXS3ZDUqd2iCeVzfYwMy6JVIew Wn7rlhiRx7O9U1+BHQoC6gnQ8MnIgGcGbN9KP0Jrn/T68250i+TshAKRUS0IBcHivnDo +rURHA35aTeClWmCBfbysNg7Ov+fbuXbYZBzEmcvSzGxhC6JD6i7/cXaDEIodjkEvRZx 2LDZoS71hGVqGqPfbbmmtxyLcNb+ZNuinUUzJiqCCpOQRX4Bay3gk4nl2c98yiRUqeCO Vp50naTooTwC7Y/SdjUuapMI1ctQWAKRR4MNUz3ml2XZoxCoozavYKDgmsNOW9drMibf Hm9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738196770; x=1738801570; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IGX0peuCCKC2MmBCZ5G6iq9o+EUJCgijgmql/75PQmQ=; b=gaYFCUrVcE2ZZQcuDqvND+4KquobbrqpX/SJjNi6h52RF80VeGn11lP6D/ezr/0Xca b7Ee3AVe5VHsgJBeRrja82qySROcUVyUzNn0yCT/zohT0uzq3Ok3gm8Nu+fFCLyMjVvM F5f8GsdVFltVZmfNwYxUuxwavZHNgLIc8V+jM4q+5J4UfdQNU2Tg+ZXL1EXWGlL/Tfsv Ot1B4ZPJlmeCi8D6xaaDue+7jJs6rhWWYvZbSj5KS1ODOxsHGFk8m1gQ+CuadSTtf247 V/7nUbl0r3Sr/N+Z8ap3t2eo0IRry0NxDrhC+p6Irf1FpahZx4k3iDWigSQwlUlHjnXd zu8g== X-Gm-Message-State: AOJu0Yxl4DfD2v3W6tDHEVM+vY/lAiWAkqY49e1uRz1KRi/Rvof5qRwp TMMZrnwWD5Pji1WCo1yuRCVIxpdNbw89Wud2X7UsIpflbulhhPLahDmxmg== X-Gm-Gg: ASbGncuIzyBvoURvLrKLbWe6sKvwZmR9Er6qQ82g7NN0ZnAhh5r+a9JS7Kw6WUXS2BI QoFp3r7x9vTP1NuAics1fbkICCcPUgpmte5zMc3yIVk4jnbbAqPkCJMzjUo0cQ6LIUMS5PSjDFx KpQcvrOhSTISgQjujC357W/W3F5BZOfQ7qMoTqP4sQgCFfmU15+jej7upulDC0KSGI/6OkMJI4l bBYrWQYI/uQY0Gse+qnXIjZCJgZvP0yZX9QcQ+dkxR7SDc2OG6JVBMSfSlhw4fTXlB9onnbI062 /7QmzFzgJS5Ofy0KTeIP5OGzuFeSmjkoOxsvHL/ysrz/Wb/Wpj6/n3I1P4d0duaOmxegFEcDisx MjNFHnwJ/pQVKZo/KUhdr5mzkPe6XORuc6Wcfle6SIhu0Hfxk X-Google-Smtp-Source: AGHT+IGCKNB20m/EoUnbdfU9ySbp+Vn+oLOp0Ml1Ym8D3mLeBUYoRvalJPbd7RBnM6yk759C9RNezw== X-Received: by 2002:a5d:4348:0:b0:385:f1f2:13ee with SMTP id ffacd0b85a97d-38c520b5646mr3483292f8f.46.1738196769853; Wed, 29 Jan 2025 16:26:09 -0800 (PST) Received: from MacBook-Pro-von-Marvin.fritz.box (p200300cccf39900035c1c9551f8739fd.dip0.t-ipconnect.de. [2003:cc:cf39:9000:35c1:c955:1f87:39fd]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c5c1017besm298181f8f.26.2025.01.29.16.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 16:26:09 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jan 2025 01:25:51 +0100 Message-Id: <20250130002552.49220-1-epirat07@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavfi/f_sendcmd: add helper to clear Command 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 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: Makes clearing the Command more explicit and consistent. --- libavfilter/f_sendcmd.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libavfilter/f_sendcmd.c b/libavfilter/f_sendcmd.c index d5d72e6410..8a0c368108 100644 --- a/libavfilter/f_sendcmd.c +++ b/libavfilter/f_sendcmd.c @@ -144,6 +144,18 @@ static void skip_comments(const char **buf) #define COMMAND_DELIMS " \f\t\n\r,;" +/** + * Clears fields and frees the buffers used by @p cmd + */ +static void clear_command(Command *cmd) +{ + cmd->flags = 0; + cmd->index = 0; + av_freep(&cmd->target); + av_freep(&cmd->command); + av_freep(&cmd->arg); +} + static int parse_command(Command *cmd, int cmd_count, int interval_count, const char **buf, void *log_ctx) { @@ -223,9 +235,7 @@ static int parse_command(Command *cmd, int cmd_count, int interval_count, return 1; fail: - av_freep(&cmd->target); - av_freep(&cmd->command); - av_freep(&cmd->arg); + clear_command(cmd); return ret; } @@ -477,9 +487,7 @@ static av_cold void uninit(AVFilterContext *ctx) Interval *interval = &s->intervals[i]; for (j = 0; j < interval->nb_commands; j++) { Command *cmd = &interval->commands[j]; - av_freep(&cmd->target); - av_freep(&cmd->command); - av_freep(&cmd->arg); + clear_command(cmd); } av_freep(&interval->commands); } -- 2.39.5 (Apple Git-154) _______________________________________________ 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".