From patchwork Mon May 18 03:30:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19733 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0384044AFD4 for ; Mon, 18 May 2020 06:31:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D9ADC68A641; Mon, 18 May 2020 06:31:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4069B68A315 for ; Mon, 18 May 2020 06:31:10 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id h4so7763686wmb.4 for ; Sun, 17 May 2020 20:31:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I5ifpP6MmKzDCkfZE+dHkYCi8RCI/v3OAcJ5XIYvSkI=; b=HjWa3KzeJaSEFTG/1U3ThbYg3Qh7BpF+Ra1v8WC7hf73bsr0gJ+gbhsPM0DlqDf83+ O5qhwaer7JLnmuFAdojBdbOSovDTJyxKlitvx7FHFiTglw1a0aK6gHMFvbH7vQtCX62A lx/A2JNjvzLW4gxG6lqmMTU5NFBPOhKutpkqrIzKCbbt9B3vUA9R2Y/eJgCJJ8f/gao1 v4NEEmwIc/0JotXZ6PKi1w2WmAkF0r9rt1t3W6Tf9xknLoj6UuMZHrN5c6VnTgERg+jI KmXBYlA0VKR4W1MDtpOLk9275ptxgPMDBQLoexIcrqdwRCF5nn9ktevbfZEMiWXdZ3Yi R3hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I5ifpP6MmKzDCkfZE+dHkYCi8RCI/v3OAcJ5XIYvSkI=; b=PCg8QevBhcDwnLNY464lNKHtmvvdVLS/cQNyxWOF1pt/Z9n1O+cDZcYXSib2tabuom Dg8PBpwNsrKuwIhHXaTC4Kw/Kp02IxlxyhFNtDdVoUIqOd7QhXW71nwrCGIMvwbGsx5P rHClMQcASe0JKpcNqnr098KCcdCwQ4S6PJjFINo/O7z/ctZjDVmK1QuY7ogN/V8/gdyi xGB3xFrz6WIXI5GddYd8VU1ZLigm5Q0L9O4ubxQqLr3UWvTliE2vRSbkhf/PMwzygjvZ 8EsV+AOn00tfyeK1FkR56cE7Z2SfsJxa6qtK/HWIgc4Kvyjs+wYfPoEe/0aNrSZxf3m+ BbIA== X-Gm-Message-State: AOAM5317OkUTZkvKv5oqxJmK/gh7Fnmn+QZm9S2wWxhb/qm5125yjNRl 2ziYEzGs5jVzQy6anLuaMfE7yuc+ X-Google-Smtp-Source: ABdhPJxnJ2YKhaw64MaSZy/Np2m8r/inDWvi1mDEQO7sFOZkVNY10/wlkQN34xPnzS8RbGfmjVrk1A== X-Received: by 2002:a1c:a952:: with SMTP id s79mr16387976wme.153.1589772669466; Sun, 17 May 2020 20:31:09 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id a21sm1011151wmm.7.2020.05.17.20.31.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 20:31:08 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 05:30:33 +0200 Message-Id: <20200518033033.27347-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200518033033.27347-1-andreas.rheinhardt@gmail.com> References: <20200518033033.27347-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/webmdashenc: Simplify parsing strings X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Don't use the functions for searching substrings when all one is looking for is a char anyway. Given that there is already a standard library function for "find last occurence of a char in a string" also allows one to remove a custom loop. Signed-off-by: Andreas Rheinhardt --- libavformat/webmdashenc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 3101e0a039..eb286cab99 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -274,7 +274,6 @@ static int parse_filename(char *filename, char **representation_id, char **initialization_pattern, char **media_pattern) { char *underscore_pos = NULL; char *period_pos = NULL; - char *temp_pos = NULL; char *filename_str = av_strdup(filename); int ret = 0; @@ -282,16 +281,12 @@ static int parse_filename(char *filename, char **representation_id, ret = AVERROR(ENOMEM); goto end; } - temp_pos = av_stristr(filename_str, "_"); - while (temp_pos) { - underscore_pos = temp_pos + 1; - temp_pos = av_stristr(temp_pos + 1, "_"); - } + underscore_pos = strrchr(filename_str, '_'); if (!underscore_pos) { ret = AVERROR_INVALIDDATA; goto end; } - period_pos = av_stristr(underscore_pos, "."); + period_pos = strchr(++underscore_pos, '.'); if (!period_pos) { ret = AVERROR_INVALIDDATA; goto end;