From patchwork Mon Jul 1 09:25:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grigorii Nazarov X-Patchwork-Id: 1954561 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=KJ32pGcq; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WCLL23mCkz1xpN for ; Mon, 1 Jul 2024 19:27:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id EB6F940AEB; Mon, 1 Jul 2024 09:27:36 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id wwMXeXP_-7HO; Mon, 1 Jul 2024 09:27:35 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 64CC240AE2 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=KJ32pGcq Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 64CC240AE2; Mon, 1 Jul 2024 09:27:34 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A1236C002B; Mon, 1 Jul 2024 09:27:34 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 11951C0033 for ; Mon, 1 Jul 2024 09:27:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 4114181DCA for ; Mon, 1 Jul 2024 09:27:29 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id P1rmUnJWFoQO for ; Mon, 1 Jul 2024 09:27:28 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::632; helo=mail-pl1-x632.google.com; envelope-from=whitecrowbar@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 92B8F81589 Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 92B8F81589 Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=KJ32pGcq Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by smtp1.osuosl.org (Postfix) with ESMTPS id 92B8F81589 for ; Mon, 1 Jul 2024 09:27:28 +0000 (UTC) Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1f9a78c6c5dso14368715ad.1 for ; Mon, 01 Jul 2024 02:27:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719826047; x=1720430847; darn=openvswitch.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=M+GJDn6V7Iq9GELfJdPAmAZr0QDz7lPXBgYwfHb4U2M=; b=KJ32pGcqNta6UwKtOsgc01PSP0dCKi1/1xCBDhzdifd+mzQBE3TRSSrL+gXru81CEI Gh+MvxY2h0T+gV4FrrzppU95twucVNc2e41AjlRnTrF1RFjUeMrHOv6fShsofrO1+xmj I+oM+7yXA38mCnh6dJlwjppA04u9RMGiATMsv37FD5LMqBhvoJi4x7S0GRkOoj3bIuWU kuVX8uV/So+ju+8uEbBty0Pl55Uq2jrbzMFMk3bb5vMvCNtcKe+z7gibVTReKTZAZD/P EaFHqt7IJ+zdwJr6rAJwdOs32tcNFvt1dvFG3wElmkFCyNE52Jw0IQjtH2YCa7pAtGc2 JLRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719826047; x=1720430847; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M+GJDn6V7Iq9GELfJdPAmAZr0QDz7lPXBgYwfHb4U2M=; b=fpb1aWUU8aogwfMiyieSOH+dHOh2bdILVGiYe+OXgSAWfFSEUNeBLKVbwi+oqCJX9R oCn6EtPug4zGqUBld+D1n9W+4+59aHddIqAQrgc7War0Aiai47282aj9NrVjJFPOPUtS 8l38NzlxGqHaL+RLwuhSJUuA+OoVuFqkIrAZWssCe5Mt1vuVrUbWiU7hAo/poyt4FOLa JVZCH5IpwPgFxR7djO8ac1/mQQSkri3B01kMrKMuK3idTD5Mq56lOkdOHzyfuBy6Tki1 7Tdv835MUdhJDB/zAQ+DcZPXC1HhV5u1XwM2kYtYG71XHYCY7D1DwOdLjlDnKjLvqa5Z qJZw== X-Gm-Message-State: AOJu0YwXgQKsZMLSJjHhvll68KETSHnEU4/szQ64S9tsQ15QuAVsUFMY +Fq+ZAABrLH9rzE+sU97FnXuOwtANJ9cl0Z1E4wJCJeOqOTUA4L7uXJLoxVy X-Google-Smtp-Source: AGHT+IF6ml5R9EA8zFk8E8GvN8dFLYOubs2cZSdnZEpy8yEFwO8g5oYORFGdMZfzu8luzKEkWcCLGg== X-Received: by 2002:a17:903:2450:b0:1f9:df92:d654 with SMTP id d9443c01a7336-1fadbc73827mr20168785ad.3.1719826047414; Mon, 01 Jul 2024 02:27:27 -0700 (PDT) Received: from localhost.localdomain ([2800:a4:c085:3c00:fc5d:c1e4:e9f9:4262]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1fac10d1559sm59695725ad.45.2024.07.01.02.27.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 02:27:27 -0700 (PDT) From: Grigorii Nazarov To: dev@openvswitch.org Date: Mon, 1 Jul 2024 12:25:20 +0300 Message-ID: <20240701092609.1045115-3-whitecrowbar@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240620085906.153885-1-whitecrowbar@gmail.com> References: <20240620085906.153885-1-whitecrowbar@gmail.com> MIME-Version: 1.0 Subject: [ovs-dev] [PATCH v4 2/3] lib/json: Simplify string serialization code. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Grigorii Nazarov Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Grigorii Nazarov --- There's an open question on whether this function should exist, or being placed in header etc. However, no decision was made yet. v2: fixed title v4: changed patch number from 3/4 to 2/3 lib/json.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/json.c b/lib/json.c index 001f6e6ab..d40e93857 100644 --- a/lib/json.c +++ b/lib/json.c @@ -127,7 +127,9 @@ static void json_parser_input(struct json_parser *, struct json_token *); static void json_error(struct json_parser *p, const char *format, ...) OVS_PRINTF_FORMAT(2, 3); - + +static void json_serialize_string(const char *, struct ds *); + const char * json_type_to_string(enum json_type type) { @@ -987,11 +989,7 @@ exit: void json_string_escape(const char *in, struct ds *out) { - struct json json = { - .type = JSON_STRING, - .string = CONST_CAST(char *, in), - }; - json_to_ds(&json, 0, out); + json_serialize_string(in, out); } static void @@ -1572,7 +1570,6 @@ static void json_serialize_object(const struct shash *object, struct json_serializer *); static void json_serialize_array(const struct json_array *, struct json_serializer *); -static void json_serialize_string(const char *, struct ds *); /* Converts 'json' to a string in JSON format, encoded in UTF-8, and returns * that string. The caller is responsible for freeing the returned string,