diff options
author | sandmann <sandmann> | 2007-07-30 04:54:30 +0000 |
---|---|---|
committer | sandmann <sandmann> | 2007-07-30 04:54:30 +0000 |
commit | b70b2c4b01ae66dfe1d987e6cb73d4783a07bced (patch) | |
tree | 4186db537c082e97d43cd8675b5a538b1c675092 | |
parent | 81b14dc2e0ab1afc30f62a9c5f4065fbb121e22c (diff) |
Get rid of signed/unsigned warnings
-rw-r--r-- | src/lac.h | 10 | ||||
-rw-r--r-- | src/lacconnection.c | 8 | ||||
-rw-r--r-- | src/lacdns-messages.c | 64 | ||||
-rw-r--r-- | src/lacdns-messages.h | 4 | ||||
-rw-r--r-- | src/lacdns-nameserver.c | 14 | ||||
-rw-r--r-- | src/lachttp.c | 2 |
6 files changed, 51 insertions, 51 deletions
@@ -214,11 +214,11 @@ void lac_byte_queue_delete_tail (LacByteQueue *queue, typedef struct LacTLS LacTLS; typedef int (* LacTLSSendFunc) (LacTLS *tls, - const guint8 *data, + const gchar *data, gsize len, GError **err); typedef int (* LacTLSRecvFunc) (LacTLS *tls, - guint8 *data, + gchar *data, gsize buf_size, GError **err); LacTLS *lac_tls_new (int fd); @@ -282,7 +282,7 @@ typedef struct { gpointer _lac_reserved0; gpointer _lac_reserved1; LacByteQueue *byte_queue; - const guint8 *data; + const gchar *data; guint len; } LacConnectionReadEvent; @@ -314,7 +314,7 @@ LacConnection * lac_connection_new (const LacAddress *add gpointer data); gpointer lac_connection_get_data (LacConnection *connection); void lac_connection_write (LacConnection *connection, - const guint8 *data, + const gchar *data, guint len); void lac_connection_write_cstr (LacConnection *connection, const gchar *data); @@ -480,7 +480,7 @@ typedef struct { typedef struct { LacHttpEventType type; - const guint8 * data; + const gchar * data; gsize length; } LacHttpContentEvent; diff --git a/src/lacconnection.c b/src/lacconnection.c index 229cb8c..d96a7f4 100644 --- a/src/lacconnection.c +++ b/src/lacconnection.c @@ -178,7 +178,7 @@ lac_connection_do_reads (gpointer data) { GError *err = NULL; LacByteQueue *queue = lac_byte_queue_new (); - guint8 *buf = (guint8 *)lac_byte_queue_alloc_tail (queue, BUF_SIZE); + gchar *buf = lac_byte_queue_alloc_tail (queue, BUF_SIZE); len = lac_recv (connection->fd, buf, BUF_SIZE, &err); @@ -229,7 +229,7 @@ lac_connection_do_writes (LacConnection *connection) while (lac_byte_queue_get_length (connection->unwritten) > 0) { GError *err = NULL; - const guint8 *unwritten; + const gchar *unwritten; gsize len, sent; unwritten = lac_byte_queue_peek (connection->unwritten, &len); @@ -424,7 +424,7 @@ lac_connection_get_data (LacConnection *connection) void lac_connection_write (LacConnection *connection, - const guint8 *data, + const gchar *data, guint len) { gboolean do_writes; @@ -461,7 +461,7 @@ lac_connection_write_cstr (LacConnection *connection, len = strlen (data); if (len > 0) - lac_connection_write (connection, (const guint8 *)data, len); + lac_connection_write (connection, (const gchar *)data, len); } void diff --git a/src/lacdns-messages.c b/src/lacdns-messages.c index 88ddcb7..2dd6e1e 100644 --- a/src/lacdns-messages.c +++ b/src/lacdns-messages.c @@ -42,10 +42,10 @@ static void traced_add_allocation (gpointer allocation, */ struct PascalString { guint len; - guint8 * data; + gchar * data; }; -static PascalString *pascal_string_traced_new (const guchar **input, +static PascalString *pascal_string_traced_new (const gchar **input, gsize *len, GList **free_list); static PascalString *pascal_string_new_from_str (const gchar *str); @@ -59,17 +59,17 @@ static void pascal_string_free (PascalString *str); /* * DomainName */ -static DomainName *domain_name_traced_new (const guchar **input, +static DomainName *domain_name_traced_new (const gchar **input, gsize *len, - const guchar *msg_start, + const gchar *msg_start, GList **free_list); /* * Question entry */ -static QuestionEntry *question_entry_traced_new (const guchar **input, +static QuestionEntry *question_entry_traced_new (const gchar **input, gsize *len, - const guchar *msg_start, + const gchar *msg_start, GList **free_list); static void question_entry_serialize (const QuestionEntry *question_entry, GString *result); @@ -80,9 +80,9 @@ static gchar * question_entry_dump (const QuestionEntry *question_ /* * Resource record */ -static ResourceRecord *resource_record_traced_new (const guchar **input, +static ResourceRecord *resource_record_traced_new (const gchar **input, gsize *len, - const guchar *msg_start, + const gchar *msg_start, GList **free_list); static void resource_record_serialize (const ResourceRecord *resource_record, GString *result); @@ -94,9 +94,9 @@ static char * resource_record_dump (const ResourceRecord *resour /* * RData */ -static RData * rdata_traced_new (const guchar **input, +static RData * rdata_traced_new (const gchar **input, gsize *len, - const guchar *msg_start, + const gchar *msg_start, RRType type, gsize rdata_len, GList **free_list); @@ -128,7 +128,7 @@ bit_range (guchar c, guint from_bit, guint to_bit) } static guint -parse_16_bit (const guchar **input, +parse_16_bit (const gchar **input, gsize *len) { guint result; @@ -147,7 +147,7 @@ parse_16_bit (const guchar **input, } static guint -parse_32_bit (const guchar **input, +parse_32_bit (const gchar **input, gsize *len) { guint result; @@ -231,9 +231,9 @@ serialize_32_bit (GString *str, * PascalString implementation */ static PascalString * -pascal_string_traced_new (const guchar **input, - gsize *len, - GList **free_list) +pascal_string_traced_new (const gchar **input, + gsize *len, + GList **free_list) { /* FIXME * @@ -344,7 +344,7 @@ pascal_string_copy (const PascalString *str) if (copy->len > 0) { - copy->data = g_new (guint8, str->len); + copy->data = g_new (gchar, str->len); g_memmove (copy->data, str->data, str->len); } else @@ -373,9 +373,9 @@ struct DomainName { }; static DomainName * -domain_name_real_traced_new (const guchar **input, +domain_name_real_traced_new (const gchar **input, gsize *len, - const guchar *msg_start, + const gchar *msg_start, guint n_bytes_used, GList **free_list) { @@ -424,7 +424,7 @@ domain_name_real_traced_new (const guchar **input, DomainName *rest_of_name; GList *list; guint offset; - const guchar *tmp_input; + const gchar *tmp_input; gssize tmp_len; if (*len < 2) @@ -454,7 +454,7 @@ domain_name_real_traced_new (const guchar **input, } rest_of_name = domain_name_real_traced_new ( - &tmp_input, &tmp_len, msg_start, n_bytes_used, free_list); + &tmp_input, (gsize *)&tmp_len, msg_start, n_bytes_used, free_list); if (!rest_of_name) return NULL; @@ -471,8 +471,8 @@ domain_name_real_traced_new (const guchar **input, } static DomainName * -domain_name_traced_new (const guchar **input, gsize *len, - const guchar *msg_start, GList **free_list) +domain_name_traced_new (const gchar **input, gsize *len, + const gchar *msg_start, GList **free_list) { g_return_val_if_fail (input != NULL, NULL); g_return_val_if_fail (*input != NULL, NULL); @@ -715,9 +715,9 @@ domain_name_n_labels (const DomainName *name) * QuestionEntry implementation */ static QuestionEntry * -question_entry_traced_new (const guchar **input, +question_entry_traced_new (const gchar **input, gsize *len, - const guchar *msg_start, + const gchar *msg_start, GList **free_list) { QuestionEntry *question_entry; @@ -845,9 +845,9 @@ question_entry_dump (const QuestionEntry *qentry) * RData implementation */ static RData * -rdata_traced_new (const guchar **input, +rdata_traced_new (const gchar **input, gsize *len, - const guchar *msg_start, + const gchar *msg_start, RRType type, gsize rdata_len, GList **free_list) @@ -1441,9 +1441,9 @@ rdata_equal (const RData *rdata1, * ResourceRecord implementation */ static ResourceRecord * -resource_record_traced_new (const guchar **input, +resource_record_traced_new (const gchar **input, gsize *len, - const guchar *msg_start, + const gchar *msg_start, GList **free_list) { ResourceRecord *record = traced_new (ResourceRecord, 1, free_list); @@ -1584,8 +1584,8 @@ resource_record_dump (const ResourceRecord *resource_record) * Message implementation */ Message * -message_new_parsed (const guchar **input, - gssize *len, +message_new_parsed (const gchar **input, + gsize *len, const gchar *msg_start) { Message *message = g_new (Message, 1); @@ -2048,7 +2048,7 @@ static const guchar valid2[] = { static void torture_test (void) { - const guchar *in = valid1; + const gchar *in = valid1; gsize len = sizeof (valid1); Message *msg; @@ -2078,7 +2078,7 @@ torture_test (void) #if 0 static void dump_data (gsize msg_len, - guchar *msg) + gchar *msg) { int i, j, k; diff --git a/src/lacdns-messages.h b/src/lacdns-messages.h index 76c58d5..8eb008d 100644 --- a/src/lacdns-messages.h +++ b/src/lacdns-messages.h @@ -132,8 +132,8 @@ struct Message { GList * free_list; }; -Message *message_new_parsed (const guchar **input, - gssize *len, +Message *message_new_parsed (const gchar **input, + gsize *len, const gchar *msg_start); Message *message_new_question (const DomainName *name, QueryRRType type); diff --git a/src/lacdns-nameserver.c b/src/lacdns-nameserver.c index 6662859..8e2eacf 100644 --- a/src/lacdns-nameserver.c +++ b/src/lacdns-nameserver.c @@ -43,7 +43,7 @@ enum { typedef struct Query Query; struct Query { gint id; - guchar * msg; + gchar * msg; gsize msg_len; NameServer * name_server; ResponseFunc callback; @@ -54,7 +54,7 @@ struct Query { static Query * query_new (guint id, - guchar *msg, + gchar *msg, gsize msg_len, NameServer *server, ResponseFunc callback, @@ -237,13 +237,13 @@ run_callbacks (GQueue *callbacks) } static void -handle_reply (GHashTable *queries, const guchar *input, gsize len, GQueue *callbacks) +handle_reply (GHashTable *queries, const gchar *input, gsize len, GQueue *callbacks) { Message *reply; Query *query; #if 0 gsize orig_len = len; - const guchar *orig_input = input; + const gchar *orig_input = input; #endif #if 0 @@ -293,7 +293,7 @@ handle_reply (GHashTable *queries, const guchar *input, gsize len, GQueue *callb } static gboolean -parse_tcp_data (GHashTable *queries, const guchar *input, gsize len) +parse_tcp_data (GHashTable *queries, const gchar *input, gsize len) { guint msg_len; @@ -456,7 +456,7 @@ name_server_read_udp (gpointer data) { NameServer *ns = data; - gint8 *msg; + gchar *msg; gssize msg_len; GQueue *callbacks = g_queue_new (); @@ -466,7 +466,7 @@ name_server_read_udp (gpointer data) { GError *err = NULL; - msg = g_new (gint8, MAX_UDP_LENGTH); + msg = g_new (gchar, MAX_UDP_LENGTH); msg_len = lac_recv (ns->fd, msg, MAX_UDP_LENGTH, &err); if (err) diff --git a/src/lachttp.c b/src/lachttp.c index 9babbe7..6717d50 100644 --- a/src/lachttp.c +++ b/src/lachttp.c @@ -2065,7 +2065,7 @@ http_transport_flush_write_buffer (HttpTransport *transport) if (n_bytes > 0) { /* FIXME: should we have a lac_connection_write_byte_queue()? */ - lac_connection_write (transport->connection, (guint8 *)bytes, n_bytes); + lac_connection_write (transport->connection, bytes, n_bytes); lac_byte_queue_delete_head (transport->write_buffer, n_bytes); } |