From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id C8AB86FFBB; Fri, 12 Nov 2021 02:55:05 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C8AB86FFBB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1636674905; bh=pqqm64jCJlQCkgWnWMeXUTooxi8lLAqDh6csuZ6Cs6c=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=T9xjl30DyXTghAgoIHaeeFgBZZsyk3qUj7fwkh+dpq6hKVGXbo6C+WkYfpjqHZ4fV Nfh/A5K4cvHsB9XUbQG4m/a3W1c9pIQW8ceQxdbayTbffq5E+BfVRDj3yD3wqMXJ3o FMbsQytQOKMTRd0NYsEfFHNGKZvA+sPgi/5fwfo0= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 3620D6FFBB for ; Fri, 12 Nov 2021 02:54:33 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 3620D6FFBB Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mlJto-0003tY-HS; Fri, 12 Nov 2021 02:54:32 +0300 To: tarantool-patches@dev.tarantool.org, sergepetrenko@tarantool.org Date: Fri, 12 Nov 2021 00:54:20 +0100 Message-Id: X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9731B3922EC0639792A6D3A674C4858A6605C298C739846CB00894C459B0CD1B9D1B2AAD36AC3629135475356F1DCB90D7F76FE7EF67E38FF3EC79052E9E97693 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7548C33FFD72831AFEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006379E90269B204C5E5D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8F4ED803F1940F2E0F1863E7A2FBA2633117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6300D3B61E77C8D3B089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458834459D11680B50537BF44C8E1EC058A4B0E440BD262664C X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C7E9FEBB9C11794A1F833287EF807CD7D9386524717C81D3A9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF11E5B64A728E1589699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34ECB3E21D3CD9CB4FEF08EB65E7B6895918C304FC37A4E0F93C60A93E9A8458A2CCA0CCEF1ED456311D7E09C32AA3244C4EB202B5DAA24FA76BBD538FA2818751FE8DA44ABE2443F7729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj4t8MBgWr8bLgKs+qEjGmww== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DE89DBD04BC27283711E208C1239B75253841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 01/11] diag: return created error from diag_set() X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Vladislav Shpilevoy via Tarantool-patches Reply-To: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" And from diag_add(). This will be helpful not to bother with box_error_last() and diag_last_error(diag_get()) in the future patch. It will change some attributes of a just created ER_READONLY error to add more details. Part of #5568 --- src/lib/core/diag.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/core/diag.h b/src/lib/core/diag.h index fa85326ad..d7d09f6fb 100644 --- a/src/lib/core/diag.h +++ b/src/lib/core/diag.h @@ -347,7 +347,7 @@ struct error * BuildSocketError(const char *file, unsigned line, const char *socketname, const char *format, ...); -#define diag_set_detailed(file, line, class, ...) do { \ +#define diag_set_detailed(file, line, class, ...) ({ \ /* Preserve the original errno. */ \ int save_errno = errno; \ say_debug("%s at %s:%i", #class, file, line); \ @@ -356,19 +356,21 @@ BuildSocketError(const char *file, unsigned line, const char *socketname, diag_set_error(diag_get(), e); \ /* Restore the errno which might have been reset. */ \ errno = save_errno; \ -} while (0) + e; \ +}) #define diag_set(...) \ diag_set_detailed(__FILE__, __LINE__, __VA_ARGS__) -#define diag_add(class, ...) do { \ +#define diag_add(class, ...) ({ \ int save_errno = errno; \ say_debug("%s at %s:%i", #class, __FILE__, __LINE__); \ struct error *e; \ e = Build##class(__FILE__, __LINE__, ##__VA_ARGS__); \ diag_add_error(diag_get(), e); \ errno = save_errno; \ -} while (0) + e; \ +}) #if defined(__cplusplus) } /* extern "C" */ -- 2.24.3 (Apple Git-128)