[librsvg: 13/18] Audit for "href" vs. "uri" in function prototypes
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 13/18] Audit for "href" vs. "uri" in function prototypes
- Date: Fri, 23 Nov 2018 22:32:35 +0000 (UTC)
commit 89ce9854ae298dab6544442848fdf8b06ab677df
Author: Federico Mena Quintero <federico gnome org>
Date: Fri Nov 23 14:33:42 2018 -0600
Audit for "href" vs. "uri" in function prototypes
- href is a possibly-relative filename.
- uri is a full URI.
librsvg/rsvg-handle.c | 8 ++++----
librsvg/rsvg-io.c | 20 ++++++++++----------
librsvg/rsvg-load.c | 4 ++--
librsvg/rsvg-private.h | 4 ++--
rsvg_internals/src/handle.rs | 14 +++++++-------
5 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/librsvg/rsvg-handle.c b/librsvg/rsvg-handle.c
index 88c05779..16cc2be2 100644
--- a/librsvg/rsvg-handle.c
+++ b/librsvg/rsvg-handle.c
@@ -1663,7 +1663,7 @@ allow_load (GFile *base_gfile, const char *uri, GError **error)
char *
_rsvg_handle_acquire_data (RsvgHandle *handle,
- const char *url,
+ const char *href,
char **content_type,
gsize *len,
GError **error)
@@ -1672,7 +1672,7 @@ _rsvg_handle_acquire_data (RsvgHandle *handle,
char *uri;
char *data;
- uri = rsvg_handle_resolve_uri (handle, url);
+ uri = rsvg_handle_resolve_uri (handle, href);
if (allow_load (priv->base_gfile, uri, error)) {
data = _rsvg_io_acquire_data (uri,
@@ -1691,7 +1691,7 @@ _rsvg_handle_acquire_data (RsvgHandle *handle,
GInputStream *
_rsvg_handle_acquire_stream (RsvgHandle *handle,
- const char *url,
+ const char *href,
char **content_type,
GError **error)
{
@@ -1699,7 +1699,7 @@ _rsvg_handle_acquire_stream (RsvgHandle *handle,
char *uri;
GInputStream *stream;
- uri = rsvg_handle_resolve_uri (handle, url);
+ uri = rsvg_handle_resolve_uri (handle, href);
if (allow_load (priv->base_gfile, uri, error)) {
stream = _rsvg_io_acquire_stream (uri,
diff --git a/librsvg/rsvg-io.c b/librsvg/rsvg-io.c
index 576fe08a..5495ee7a 100644
--- a/librsvg/rsvg-io.c
+++ b/librsvg/rsvg-io.c
@@ -139,7 +139,7 @@ rsvg_acquire_gvfs_data (const char *uri,
}
char *
-_rsvg_io_acquire_data (const char *href,
+_rsvg_io_acquire_data (const char *uri,
const char *base_uri,
char **mime_type,
gsize *len,
@@ -149,7 +149,7 @@ _rsvg_io_acquire_data (const char *href,
char *data;
gsize llen;
- if (!(href && *href)) {
+ if (!(uri && *uri)) {
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Invalid URI");
return NULL;
@@ -158,17 +158,17 @@ _rsvg_io_acquire_data (const char *href,
if (!len)
len = &llen;
- if (strncmp (href, "data:", 5) == 0)
- return rsvg_decode_data_uri (href, mime_type, len, error);
+ if (strncmp (uri, "data:", 5) == 0)
+ return rsvg_decode_data_uri (uri, mime_type, len, error);
- if ((data = rsvg_acquire_gvfs_data (href, base_uri, mime_type, len, cancellable, error)))
+ if ((data = rsvg_acquire_gvfs_data (uri, base_uri, mime_type, len, cancellable, error)))
return data;
return NULL;
}
GInputStream *
-_rsvg_io_acquire_stream (const char *href,
+_rsvg_io_acquire_stream (const char *uri,
const char *base_uri,
char **mime_type,
GCancellable *cancellable,
@@ -178,20 +178,20 @@ _rsvg_io_acquire_stream (const char *href,
char *data;
gsize len;
- if (!(href && *href)) {
+ if (!(uri && *uri)) {
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Invalid URI");
return NULL;
}
- if (strncmp (href, "data:", 5) == 0) {
- if (!(data = rsvg_decode_data_uri (href, mime_type, &len, error)))
+ if (strncmp (uri, "data:", 5) == 0) {
+ if (!(data = rsvg_decode_data_uri (uri, mime_type, &len, error)))
return NULL;
return g_memory_input_stream_new_from_data (data, len, (GDestroyNotify) g_free);
}
- if ((stream = rsvg_acquire_gvfs_stream (href, base_uri, mime_type, cancellable, error)))
+ if ((stream = rsvg_acquire_gvfs_stream (uri, base_uri, mime_type, cancellable, error)))
return stream;
return NULL;
diff --git a/librsvg/rsvg-load.c b/librsvg/rsvg-load.c
index 45a33d35..45183d94 100644
--- a/librsvg/rsvg-load.c
+++ b/librsvg/rsvg-load.c
@@ -268,7 +268,7 @@ create_xml_stream_parser (RsvgLoad *load,
}
gboolean
-rsvg_load_handle_xml_xinclude (RsvgHandle *handle, const char *url)
+rsvg_load_handle_xml_xinclude (RsvgHandle *handle, const char *href)
{
GInputStream *stream;
GError *err = NULL;
@@ -277,7 +277,7 @@ rsvg_load_handle_xml_xinclude (RsvgHandle *handle, const char *url)
g_assert (handle->priv->load != NULL);
- stream = _rsvg_handle_acquire_stream (handle, url, &mime_type, NULL);
+ stream = _rsvg_handle_acquire_stream (handle, href, &mime_type, NULL);
g_free (mime_type);
diff --git a/librsvg/rsvg-private.h b/librsvg/rsvg-private.h
index e1b85a92..e0465f21 100644
--- a/librsvg/rsvg-private.h
+++ b/librsvg/rsvg-private.h
@@ -265,13 +265,13 @@ gboolean rsvg_handle_keep_image_data (RsvgHandle *handle);
G_GNUC_INTERNAL
char *_rsvg_handle_acquire_data (RsvgHandle *handle,
- const char *uri,
+ const char *href,
char **content_type,
gsize *len,
GError **error);
G_GNUC_INTERNAL
GInputStream *_rsvg_handle_acquire_stream (RsvgHandle *handle,
- const char *uri,
+ const char *href,
char **content_type,
GError **error);
diff --git a/rsvg_internals/src/handle.rs b/rsvg_internals/src/handle.rs
index 5f62755a..0f4e3895 100644
--- a/rsvg_internals/src/handle.rs
+++ b/rsvg_internals/src/handle.rs
@@ -27,14 +27,14 @@ extern "C" {
fn rsvg_handle_load_extern(
handle: *const RsvgHandle,
- uri: *const libc::c_char,
+ href: *const libc::c_char,
) -> *const RsvgHandle;
fn rsvg_handle_get_css_styles(handle: *const RsvgHandle) -> *mut RsvgCssStyles;
fn _rsvg_handle_acquire_data(
handle: *mut RsvgHandle,
- url: *const libc::c_char,
+ href: *const libc::c_char,
out_content_type: *mut *mut libc::c_char,
out_len: *mut usize,
error: *mut *mut glib_sys::GError,
@@ -44,7 +44,7 @@ extern "C" {
fn rsvg_load_handle_xml_xinclude(
handle: *mut RsvgHandle,
- url: *const libc::c_char,
+ href: *const libc::c_char,
) -> glib_sys::gboolean;
}
@@ -83,7 +83,7 @@ pub struct BinaryData {
pub content_type: Option<String>,
}
-pub fn acquire_data(handle: *mut RsvgHandle, url: &str) -> Result<BinaryData, glib::Error> {
+pub fn acquire_data(handle: *mut RsvgHandle, href: &str) -> Result<BinaryData, glib::Error> {
unsafe {
let mut content_type: *mut libc::c_char = ptr::null_mut();
let mut len = 0;
@@ -91,7 +91,7 @@ pub fn acquire_data(handle: *mut RsvgHandle, url: &str) -> Result<BinaryData, gl
let buf = _rsvg_handle_acquire_data(
handle,
- url.to_glib_none().0,
+ href.to_glib_none().0,
&mut content_type as *mut *mut _,
&mut len,
&mut error,
@@ -192,8 +192,8 @@ pub fn image_surface_new_from_href(
}
// FIXME: distinguish between "file not found" and "invalid XML"
-pub fn load_xml_xinclude(handle: *mut RsvgHandle, url: &str) -> bool {
- unsafe { from_glib(rsvg_load_handle_xml_xinclude(handle, url.to_glib_none().0)) }
+pub fn load_xml_xinclude(handle: *mut RsvgHandle, href: &str) -> bool {
+ unsafe { from_glib(rsvg_load_handle_xml_xinclude(handle, href.to_glib_none().0)) }
}
pub fn load_css(handle: *mut RsvgHandle, href: &str) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]