Fixed 'xmlChar' signedness gcc(1) warnings.

[captive.git] / src / libcaptive / client / giochannel-blind.c

diff --git a/src/libcaptive/client/giochannel-blind.c b/src/libcaptive/client/giochannel-blind.c
index 5590eb4..7fdb625 100644 (file)
--- a/src/libcaptive/client/giochannel-blind.c
+++ b/src/libcaptive/client/giochannel-blind.c
@@ -616,8 +616,8 @@ xmlNode *xml_media;
                        NULL);  /* error */
        g_assert(errgiostatus==G_IO_STATUS_NORMAL);
 
-       xml_media=xmlNewTextChild(xml_parent,NULL,"media",NULL);
-       xmlNewProp(xml_media,"size",captive_printf_alloca("%" G_GUINT64_FORMAT,giochannel_blind->size));
+       xml_media=xmlNewTextChild(xml_parent,NULL,BAD_CAST "media",NULL);
+       xmlNewProp(xml_media,BAD_CAST "size",BAD_CAST captive_printf_alloca("%" G_GUINT64_FORMAT,giochannel_blind->size));
 
        blind_block_array=captive_giochannel_blind_as_sorted_array
                        (giochannel_blind,captive_giochannel_blind_read_as_sorted_array_foreach);
@@ -665,10 +665,10 @@ gchar hex_out[0
                *gd++=0;
                g_assert(s==hex+2+2*GIOCHANNEL_BLIND_BLOCK_SIZE);
                g_assert(gd==hex_out+sizeof(hex_out));
-               xml_media_read=xmlNewTextChild(xml_media,NULL,"block",hex_out);
+               xml_media_read=xmlNewTextChild(xml_media,NULL,BAD_CAST "block",BAD_CAST hex_out);
                {
                        g_snprintf(offset_string,sizeof(offset_string),"%" G_GUINT64_FORMAT,blind_block->offset);
-                       xmlNewProp(xml_media_read,"offset",offset_string);
+                       xmlNewProp(xml_media_read,BAD_CAST "offset",BAD_CAST offset_string);
                        }
                }
 
@@ -681,7 +681,7 @@ gchar hex_out[0
 struct captive_giochannel_blind *captive_giochannel_blind_new_from_xml(xmlTextReader *xml_reader)
 {
 struct captive_giochannel_blind *r;
-const xmlChar *xml_name;
+const gchar *xml_name;
 int errint;
 GIOStatus erriostatus;
 gboolean scan_end;
@@ -691,12 +691,12 @@ struct captive_libxml_string_drop_stack *drop_stack=NULL;
        g_return_val_if_fail(xmlTextReaderNodeType(xml_reader)==CAPTIVE_XML_TEXT_READER_NODE_TYPE_START,NULL);
        xml_name=captive_libxml_string_drop(&drop_stack,xmlTextReaderName(xml_reader));
        g_return_val_if_fail(xml_name!=NULL,NULL);
-       g_return_val_if_fail(!xmlStrcmp(xml_name,"media"),NULL);
+       g_return_val_if_fail(!strcmp(xml_name,"media"),NULL);
 
        r=captive_giochannel_blind_new(
                        NULL,   /* giochannel_orig */
                        TRUE);  /* writeable */
-       r->size=captive_libxml_sscanf_gint64(captive_libxml_string_drop(&drop_stack,xmlTextReaderGetAttribute(xml_reader,"size")));
+       r->size=captive_libxml_sscanf_gint64(captive_libxml_string_drop(&drop_stack,xmlTextReaderGetAttribute(xml_reader,BAD_CAST "size")));
 
        scan_end=FALSE;
        do {
@@ -712,21 +712,21 @@ int got_type;
                        case CAPTIVE_XML_TEXT_READER_NODE_TYPE_TEXT:    /* Even empty nodes have some '#text'. */
                                break;
                        case CAPTIVE_XML_TEXT_READER_NODE_TYPE_START: {
-const xmlChar *xml_name;
+const gchar *xml_name;
 
                                xml_name=captive_libxml_string_drop(&drop_stack,xmlTextReaderName(xml_reader));
                                g_assert(xml_name!=NULL);
-                               if (!xmlStrcmp(xml_name,"block")) {
+                               if (!strcmp(xml_name,"block")) {
 guint64 offset;
 gsize bytes_written;
-const xmlChar *xml_text_hex_in,*xml_char_s;
+const gchar *xml_text_hex_in,*xml_char_s;
 BIGNUM *bignum;
 int bignum_num_bytes;
 gchar bin_hex[2*GIOCHANNEL_BLIND_BLOCK_SIZE+1],*gd;
 unsigned char bin_out[GIOCHANNEL_BLIND_BLOCK_SIZE];
 
                                        offset=captive_libxml_sscanf_gint64(
-                                                       captive_libxml_string_drop(&drop_stack,xmlTextReaderGetAttribute(xml_reader,"offset")));
+                                                       captive_libxml_string_drop(&drop_stack,xmlTextReaderGetAttribute(xml_reader,BAD_CAST "offset")));
 
                                        errint=xmlTextReaderRead(xml_reader);
                                        g_assert(errint==1);
@@ -774,13 +774,13 @@ unsigned char bin_out[GIOCHANNEL_BLIND_BLOCK_SIZE];
                                else g_error("Unknown START node: %s",xml_name);
                                } break;
                        case CAPTIVE_XML_TEXT_READER_NODE_TYPE_END: {
-const xmlChar *xml_name;
+const gchar *xml_name;
 
                                xml_name=captive_libxml_string_drop(&drop_stack,xmlTextReaderName(xml_reader));
-                               /**/ if (!xmlStrcmp(xml_name,"media")) {
+                               /**/ if (!strcmp(xml_name,"media")) {
                                        scan_end=TRUE;  /* proper cleanup */
                                        }
-                               else if (!xmlStrcmp(xml_name,"block")) {
+                               else if (!strcmp(xml_name,"block")) {
                                        }
                                else g_error("Unknown END node: %s",xml_name);
                                } break;