From patchwork Tue Dec 20 09:38:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Faiz X-Patchwork-Id: 1868 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1595656vsa; Tue, 20 Dec 2016 01:48:37 -0800 (PST) X-Received: by 10.28.93.74 with SMTP id r71mr1048831wmb.67.1482227317876; Tue, 20 Dec 2016 01:48:37 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ll4si21996101wjc.32.2016.12.20.01.48.37; Tue, 20 Dec 2016 01:48:37 -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; 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 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 17DA168A1D8; Tue, 20 Dec 2016 11:48:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9727668A0F9 for ; Tue, 20 Dec 2016 11:48:19 +0200 (EET) Received: by mail-pf0-f194.google.com with SMTP id c4so8763029pfb.3 for ; Tue, 20 Dec 2016 01:48:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=toUqQa8KykqEZxFqZcpSoFp57Njmv0m16noBlz6/W04=; b=P4Pru4cqZ55USMYvovze9R3+Svh2L33Q3JPJ4SRsZwcoeCb/eziqfdtQDXFGubAQAq 7awOa3+Vw8wM/XpaLULVgFWJ0wi3ZI/93sjSnV6Plc8uCTECNVnSjpCKwQO59gbeOIFW dkPyOXlmNv9HMx+ICC0+WwpWZju0Pzt6zjDYoCZ1Fk3/hYbzGiF/3GLEzdRlpPx45lHK 3z3mQLFF3mZbl+hUKMFHCqO2Q3NysA5nTUOgn75ghERVC/GqSnS4nmE1sktbLV36jSYq vFlzIaibQXLaV8WCg/mu4M8VYmgJ2Sl5DEWryH8OxUmlwDurv8ibdrvA64wIgbt+AtPh t7DQ== 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; bh=toUqQa8KykqEZxFqZcpSoFp57Njmv0m16noBlz6/W04=; b=K8EL7kDB5eeDW6gnr8QdcTlq7Pr2qminbvzuH2OysRF6a9JXSZHj3I7Ynoos+hhDt5 n4ffVtDI70UePmeBMBCrX/GPLAS1UOmwV1/y4+A5x/QuzxE7y1nUhm2AHTyBV0LXfsF/ gWD0oOohnICHWnZ+5a7HJ5grN3z+0z3DD1gzc6ahXj30pPDvK6rncHdqIS73ZwpnE94x FUYxhM2MpUBF4NZOaqbiBduNVefC1BHsZIhMwOfT108yHsS0u0umoUVRR5F+6nn6GEmM I4SZhkxWbnewmWx+kcZy9S/nZVGqbHBF5D4GI4ETPxYulkZIuxZb72Vt4Ek1WBo2ijN5 wPzQ== X-Gm-Message-State: AKaTC02DUJjEyRJZQXUEicho15GE/7tlEF896LeuqpzAfLqeZjKAK3BOU6zIvVKOyUt7HA== X-Received: by 10.98.79.25 with SMTP id d25mr17898293pfb.42.1482226816658; Tue, 20 Dec 2016 01:40:16 -0800 (PST) Received: from localhost.localdomain.localdomain ([114.120.235.144]) by smtp.gmail.com with ESMTPSA id p25sm37553662pfk.20.2016.12.20.01.40.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Dec 2016 01:40:16 -0800 (PST) From: Muhammad Faiz To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Dec 2016 16:38:34 +0700 Message-Id: <1482226714-3450-1-git-send-email-mfcc64@gmail.com> X-Mailer: git-send-email 2.5.0 Subject: [FFmpeg-devel] [PATCH] avutil/common: add FFRET/FFGOTO macro 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: Muhammad Faiz MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" FFRET_ERR and FFGOTO_ERR for common error handling FFRET_OOM and FFGOTO_OOM for oom handling Signed-off-by: Muhammad Faiz --- libavutil/common.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libavutil/common.h b/libavutil/common.h index 8142b31..b868d60 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -99,6 +99,29 @@ #define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) #define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0])) +/* Common error handling */ +#define FFRET_ERR(val, ...) \ + do { \ + int ffret_err_ret__ = (val); \ + if (ffret_err_ret__ < 0) { \ + __VA_ARGS__; \ + return ffret_err_ret__; \ + } \ + } while (0) + +#define FFGOTO_ERR(val, ret, dst, ...) \ + do { \ + int ffgoto_err_ret__ = (val); \ + if (ffgoto_err_ret__ < 0) { \ + ret = ffgoto_err_ret__; \ + __VA_ARGS__; \ + goto dst; \ + } \ + } while (0) + +#define FFRET_OOM(val, ...) FFRET_ERR((val) ? 0 : AVERROR(ENOMEM), __VA_ARGS__) +#define FFGOTO_OOM(val, ret, dst, ...) FFGOTO_ERR((val) ? 0 : AVERROR(ENOMEM), ret, dst, __VA_ARGS__) + /* misc math functions */ #ifdef HAVE_AV_CONFIG_H