luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 15:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gthreadedresolver: Tighten up types and constness of parsing code

Browse Source 
Not everything should be an int. This code is quite dated. We now try to
use `guint8*` to represent arbitrary binary data, rather than `guchar*`
(which makes it sound like some form of string).

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2021-12-15 16:55:57 +00:00
parent 49e667d250
commit 4d6da4457a
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gio/gthreadedresolver.c
View File

@ -530,9 +530,9 @@ typedef enum __ns_type {
#endif /* __BIONIC__ */
static GVariant *
parse_res_srv (guchar *answer,
guchar *end,
guchar **p)
parse_res_srv (const guint8 *answer,
const guint8 *end,
const guint8 **p)
{
gchar namebuf[1024];
guint16 priority, weight, port;
@ -550,9 +550,9 @@ parse_res_srv (guchar *answer,
}
static GVariant *
parse_res_soa (guchar *answer,
guchar *end,
guchar **p)
parse_res_soa (const guint8 *answer,
const guint8 *end,
const guint8 **p)
{
gchar mnamebuf[1024];
gchar rnamebuf[1024];
@ -578,9 +578,9 @@ parse_res_soa (guchar *answer,
}
static GVariant *
parse_res_ns (guchar *answer,
guchar *end,
guchar **p)
parse_res_ns (const guint8 *answer,
const guint8 *end,
const guint8 **p)
{
gchar namebuf[1024];
@ -590,9 +590,9 @@ parse_res_ns (guchar *answer,
}
static GVariant *
parse_res_mx (guchar *answer,
guchar *end,
guchar **p)
parse_res_mx (const guint8 *answer,
const guint8 *end,
const guint8 **p)
{
gchar namebuf[1024];
guint16 preference;
@ -607,13 +607,13 @@ parse_res_mx (guchar *answer,
}
static GVariant *
parse_res_txt (guchar *answer,
guchar *end,
guchar **p)
parse_res_txt (const guint8 *answer,
const guint8 *end,
const guint8 **p)
{
GVariant *record;
GPtrArray *array;
guchar *at = *p;
const guint8 *at = *p;
gsize len;
array = g_ptr_array_new_with_free_func (g_free);
@ -655,16 +655,16 @@ g_resolver_record_type_to_rrtype (GResolverRecordType type)
GList *
g_resolver_records_from_res_query (const gchar *rrname,
gint rrtype,
guchar *answer,
gint len,
const guint8 *answer,
gssize len,
gint herr,
GError **error)
{
gint count;
gchar namebuf[1024];
guchar *end, *p;
const guint8 *end, *p;
guint16 type, qclass, rdlength;
HEADER *header;
const HEADER *header;
GList *records;
GVariant *record;

4
gio/gthreadedresolver.h
View File

@ -46,8 +46,8 @@ GType g_threaded_resolver_get_type (void) G_GNUC_CONST;
GLIB_AVAILABLE_IN_ALL
GList *g_resolver_records_from_res_query (const gchar *rrname,
gint rrtype,
guchar *answer,
gint len,
const guint8 *answer,
gssize len,
gint herr,
GError **error);