From patchwork Wed Apr 12 07:11:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 3373 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp138799vsd; Wed, 12 Apr 2017 00:11:49 -0700 (PDT) X-Received: by 10.28.66.207 with SMTP id k76mr18471656wmi.121.1491981109067; Wed, 12 Apr 2017 00:11:49 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b10si29707245wrd.125.2017.04.12.00.11.48; Wed, 12 Apr 2017 00:11:49 -0700 (PDT) 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; 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=NONE 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 EFDC4689747; Wed, 12 Apr 2017 10:11:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f173.google.com (mail-io0-f173.google.com [209.85.223.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 555EC689723 for ; Wed, 12 Apr 2017 10:11:33 +0300 (EEST) Received: by mail-io0-f173.google.com with SMTP id r16so28930459ioi.2 for ; Wed, 12 Apr 2017 00:11:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=ZzsqcZOjOyQgpxcnyEUcLz4EAjZaUDHv3EG0oICJ/ag=; b=erO4rtlrarbMoTjr4sDTmLUcGP6TPuzUUW2L+IX9CibZReIuqtN8SHF71IdvhBxyAf +rhf77uf2ayeMnvpRxegfgE6q2T2KK7kDUWFslv7QV8hIVRHGqzKVG0XTwnGQDiZUNoU jFsbhyoP+RthWtiPZ77R7hwIIGLls09zg7Ww9TcT0wn7CEwwe37VuSCH51E2PvDpvWSe 1UUZaqW2b9tl/HXUcYabfx3bM/e/WfQ+uALSmE2Q6dY4EsPUTdLDjwp7Huwq/9+ll5Cf emgo4PN4ahvxKOBiRjkH5BVgXEenf0zBzmk4Fm1F0OgKD01mh4e6nW638Pz93jY5HJ07 1aIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=ZzsqcZOjOyQgpxcnyEUcLz4EAjZaUDHv3EG0oICJ/ag=; b=FXwr9OscG4BIqhYDCnkKs0hakkG0XRglb3+8HP8rXLxpLOhD/yRstO9EIJsBYxjIGp g56eXLl90zTJwbFyBRJk3m403Lte8Vywd58/uSIbX1gA77YgIXlEPLCIc0JUN01S/s4T tWj733fQ0IVhzpAuCo0DVxnHuviEM6nMugDMT6dAAwDrlnFsTxTNG9CGvWedJhpe/kEb K3+sSiKu5bkPkKbMERp+cZHUMgG1Iw7GAWUOXv3TqTcrTiWkaoB81rTajv/6ozsSbzOK 8jDXj9gV17R/renZ4fqxyRVDr44liNXI6L4C1dg+Lgk7eBimZ9Gvn+MPrrEFWtdPMz60 l1Vw== X-Gm-Message-State: AN3rC/642qR0Eb7QZ5XCcLCOEpI7S+UlM01KpoYzrVLAI9qsr7z2padc9o2jTLQiCdHprQ== X-Received: by 10.107.168.90 with SMTP id r87mr13196945ioe.45.1491981097302; Wed, 12 Apr 2017 00:11:37 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-110-121-59.hsd1.il.comcast.net. [73.110.121.59]) by smtp.gmail.com with ESMTPSA id p3sm3857213ioi.20.2017.04.12.00.11.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 12 Apr 2017 00:11:36 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Apr 2017 02:11:23 -0500 Message-Id: <20170412071127.60511-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.11.1 Subject: [FFmpeg-devel] [PATCH 1/5] lavu/bprint: reorder cases to match enum order 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavutil/bprint.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/libavutil/bprint.c b/libavutil/bprint.c index 2f059c5ba6..652775bef9 100644 --- a/libavutil/bprint.c +++ b/libavutil/bprint.c @@ -271,19 +271,8 @@ void av_bprint_escape(AVBPrint *dstbuf, const char *src, const char *special_cha mode = AV_ESCAPE_MODE_BACKSLASH; /* TODO: implement a heuristic */ switch (mode) { - case AV_ESCAPE_MODE_QUOTE: - /* enclose the string between '' */ - av_bprint_chars(dstbuf, '\'', 1); - for (; *src; src++) { - if (*src == '\'') - av_bprintf(dstbuf, "'\\''"); - else - av_bprint_chars(dstbuf, *src, 1); - } - av_bprint_chars(dstbuf, '\'', 1); - break; - /* case AV_ESCAPE_MODE_BACKSLASH or unknown mode */ + case AV_ESCAPE_MODE_BACKSLASH: default: /* \-escape characters */ for (; *src; src++) { @@ -301,5 +290,17 @@ void av_bprint_escape(AVBPrint *dstbuf, const char *src, const char *special_cha av_bprint_chars(dstbuf, *src, 1); } break; + + case AV_ESCAPE_MODE_QUOTE: + /* enclose the string between '' */ + av_bprint_chars(dstbuf, '\'', 1); + for (; *src; src++) { + if (*src == '\'') + av_bprintf(dstbuf, "'\\''"); + else + av_bprint_chars(dstbuf, *src, 1); + } + av_bprint_chars(dstbuf, '\'', 1); + break; } }