From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>
Cc: Stefan Weil <sw@weilnetz.de>, qemu-trivial@nongnu.org
Subject: [PATCH 3/5] util/uri: Remove the uri_string_escape() function
Date: Mon, 22 Jan 2024 20:17:51 +0100 [thread overview]
Message-ID: <20240122191753.103118-4-thuth@redhat.com> (raw)
In-Reply-To: <20240122191753.103118-1-thuth@redhat.com>
It is not used in QEMU - and if somebody needs this functionality,
they can simply use g_uri_escape_string() from the glib instead.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
include/qemu/uri.h | 1 -
util/uri.c | 64 ----------------------------------------------
2 files changed, 65 deletions(-)
diff --git a/include/qemu/uri.h b/include/qemu/uri.h
index aa54b6f251..c1734d28c3 100644
--- a/include/qemu/uri.h
+++ b/include/qemu/uri.h
@@ -78,7 +78,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);
char *uri_string_unescape(const char *str, int len);
void uri_free(URI *uri);
diff --git a/util/uri.c b/util/uri.c
index 2a75f535ba..912e406523 100644
--- a/util/uri.c
+++ b/util/uri.c
@@ -1589,70 +1589,6 @@ char *uri_string_unescape(const char *str, int len)
return g_uri_unescape_string(lstr, NULL);
}
-/**
- * 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 == NULL) {
- return NULL;
- }
- if (str[0] == 0) {
- return g_strdup(str);
- }
- len = strlen(str);
- if (!(len > 0)) {
- return NULL;
- }
-
- len += 20;
- ret = g_malloc(len);
- in = str;
- out = 0;
- while (*in != 0) {
- if (len - out <= 3) {
- temp = realloc2n(ret, &len);
- ret = temp;
- }
-
- ch = *in;
-
- if ((ch != '@') && (!IS_UNRESERVED(ch)) && (!strchr(list, ch))) {
- unsigned char val;
- ret[out++] = '%';
- val = ch >> 4;
- if (val <= 9) {
- ret[out++] = '0' + val;
- } else {
- ret[out++] = 'A' + val - 0xA;
- }
- val = ch & 0xF;
- if (val <= 9) {
- ret[out++] = '0' + val;
- } else {
- ret[out++] = 'A' + val - 0xA;
- }
- in++;
- } else {
- ret[out++] = *in++;
- }
- }
- ret[out] = 0;
- return ret;
-}
-
/************************************************************************
* *
* Public functions *
--
2.43.0
next prev parent reply other threads:[~2024-01-22 19:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-22 19:17 [PATCH 0/5] util/uri: Simplify the code, remove unused functions Thomas Huth
2024-01-22 19:17 ` [PATCH 1/5] util/uri: Remove the unused "target" argument from uri_string_unescape() Thomas Huth
2024-01-22 20:45 ` Stefan Weil
2024-01-23 5:45 ` Philippe Mathieu-Daudé
2024-01-22 19:17 ` [PATCH 2/5] util/uri: Simplify uri_string_unescape() Thomas Huth
2024-01-22 21:22 ` Stefan Weil
2024-01-23 6:01 ` Thomas Huth
2024-01-23 10:25 ` Paolo Bonzini
2024-01-23 11:21 ` Thomas Huth
2024-01-22 19:17 ` Thomas Huth [this message]
2024-01-22 20:59 ` [PATCH 3/5] util/uri: Remove the uri_string_escape() function Stefan Weil
2024-01-23 6:03 ` Thomas Huth
2024-01-22 19:17 ` [PATCH 4/5] util/uri: Remove unused functions uri_resolve() and uri_resolve_relative() Thomas Huth
2024-01-22 21:03 ` Stefan Weil
2024-01-22 19:17 ` [PATCH 5/5] util/uri: Remove unused macros ISA_RESERVED() and ISA_GEN_DELIM() Thomas Huth
2024-01-22 21:04 ` Stefan Weil
2024-01-23 5:50 ` Philippe Mathieu-Daudé
2024-01-22 19:22 ` [PATCH 0/5] util/uri: Simplify the code, remove unused functions Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240122191753.103118-4-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=sw@weilnetz.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).