From nobody Tue Nov 26 18:47:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1706093036; cv=none; d=zohomail.com; s=zohoarc; b=Ig45Tbdjf8WoyXQlfh8h9pfpZONxqy2iGmLyJLdXkGul3Kx6NhZIB0bT9i7nqIwknZAhFkFb3EG7Ph54kW1BSnuzsj8h6q4mYvrTMO/CFzozI05VjMcSqrFkNKv8CxkGqWRlp4vGB5ekik3ixv6aHuY3dHpDY2be1PwBVYvtqEw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706093036; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vcl72f/E7hbNeP2SVabcPJdBfI6DFYoL5hfbTr8OIhY=; b=mluyjRzreQwfwOMKdRjX0Y7y87ZdXJQ9jetFvB5/lwEmQ0mM/iEpMH/vIbEGnjypVtb3M2daB+tOUhgC0aE/O4vrSdvF3Pq8GaM+rIfeD++L4LxRSFIE117brThuxn5x/gKoBG4v3gOVuRr1OBduA1K+6H7pgL5F6R31JfUhhbE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1706093036168638.1843293787736; Wed, 24 Jan 2024 02:43:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSaiZ-0008KP-7Y; Wed, 24 Jan 2024 05:42:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rSaiX-0008HT-NU for qemu-devel@nongnu.org; Wed, 24 Jan 2024 05:42:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rSaiW-0008Fm-5W for qemu-devel@nongnu.org; Wed, 24 Jan 2024 05:42:49 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-433-gxQof-vONlCY9BDTsUoVmA-1; Wed, 24 Jan 2024 05:42:43 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BC2461013664; Wed, 24 Jan 2024 10:42:42 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id A569751D5; Wed, 24 Jan 2024 10:42:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706092966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vcl72f/E7hbNeP2SVabcPJdBfI6DFYoL5hfbTr8OIhY=; b=Lbp1EnOh2md9RpEpWa630LPn21RfRXEA/9t9NxGeckQPOe+GjkFT2sGQxYtuDsuvWToV4G a0C3yp7k4e0Ne8orsY5oVaYoJ03DWYrKhGPJslOHLKrfAPEtebZwP5wDBw5/n9AdlLPqcx hGV5BOsU2/mNd2u7uK8XjlUL9mKkRR8= X-MC-Unique: gxQof-vONlCY9BDTsUoVmA-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 6/7] util/uri: Remove the uri_string_escape() function Date: Wed, 24 Jan 2024 11:42:30 +0100 Message-ID: <20240124104231.603418-7-thuth@redhat.com> In-Reply-To: <20240124104231.603418-1-thuth@redhat.com> References: <20240124104231.603418-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.327, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1706093036648100005 Now that uri_resolve_relative() has been removed, this function is not used in QEMU anymore - and if somebody needs this functionality, they can simply use g_uri_escape_string() from the glib instead. Reviewed-by: Stefan Weil Reviewed-by: "Daniel P. Berrang=C3=A9" Message-ID: <20240123182247.432642-4-thuth@redhat.com> Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- include/qemu/uri.h | 1 - util/uri.c | 70 ---------------------------------------------- 2 files changed, 71 deletions(-) diff --git a/include/qemu/uri.h b/include/qemu/uri.h index 899ce852f5..255e61f452 100644 --- a/include/qemu/uri.h +++ b/include/qemu/uri.h @@ -76,7 +76,6 @@ URI *uri_parse(const char *str); URI *uri_parse_raw(const char *str, int raw); int uri_parse_into(URI *uri, const char *str); char *uri_to_string(URI *uri); -char *uri_string_escape(const char *str, const char *list); void uri_free(URI *uri); =20 /* Single web service query parameter 'name=3Dvalue'. */ diff --git a/util/uri.c b/util/uri.c index 1891ca6fb3..350835b03f 100644 --- a/util/uri.c +++ b/util/uri.c @@ -1349,76 +1349,6 @@ void uri_free(URI *uri) g_free(uri); } =20 -/************************************************************************ - * * - * Helper functions * - * * - ************************************************************************/ - -/** - * uri_string_escape: - * @str: string to escape - * @list: exception list string of chars not to escape - * - * This routine escapes a string to hex, ignoring reserved characters (a-z) - * and the characters in the exception list. - * - * Returns a new escaped string or NULL in case of error. - */ -char *uri_string_escape(const char *str, const char *list) -{ - char *ret, ch; - char *temp; - const char *in; - int len, out; - - if (str =3D=3D NULL) { - return NULL; - } - if (str[0] =3D=3D 0) { - return g_strdup(str); - } - len =3D strlen(str); - if (!(len > 0)) { - return NULL; - } - - len +=3D 20; - ret =3D g_malloc(len); - in =3D str; - out =3D 0; - while (*in !=3D 0) { - if (len - out <=3D 3) { - temp =3D realloc2n(ret, &len); - ret =3D temp; - } - - ch =3D *in; - - if ((ch !=3D '@') && (!IS_UNRESERVED(ch)) && (!strchr(list, ch))) { - unsigned char val; - ret[out++] =3D '%'; - val =3D ch >> 4; - if (val <=3D 9) { - ret[out++] =3D '0' + val; - } else { - ret[out++] =3D 'A' + val - 0xA; - } - val =3D ch & 0xF; - if (val <=3D 9) { - ret[out++] =3D '0' + val; - } else { - ret[out++] =3D 'A' + val - 0xA; - } - in++; - } else { - ret[out++] =3D *in++; - } - } - ret[out] =3D 0; - return ret; -} - /************************************************************************ * * * Public functions * --=20 2.43.0