OSDN Git Service

gobex: Get rid of gchar
authorLucas De Marchi <lucas.de.marchi@gmail.com>
Wed, 1 May 2013 04:51:58 +0000 (01:51 -0300)
committerJohan Hedberg <johan.hedberg@intel.com>
Thu, 2 May 2013 06:02:31 +0000 (09:02 +0300)
Use plain char instead of gchar.

gobex/gobex.c

index 9be5d39..deeab40 100644 (file)
@@ -260,9 +260,9 @@ static gboolean write_stream(GObex *obex, GError **err)
 {
        GIOStatus status;
        gsize bytes_written;
-       gchar *buf;
+       char *buf;
 
-       buf = (gchar *) &obex->tx_buf[obex->tx_sent];
+       buf = (char *) &obex->tx_buf[obex->tx_sent];
        status = g_io_channel_write_chars(obex->io, buf, obex->tx_data,
                                                        &bytes_written, err);
        if (status != G_IO_STATUS_NORMAL)
@@ -280,9 +280,9 @@ static gboolean write_packet(GObex *obex, GError **err)
 {
        GIOStatus status;
        gsize bytes_written;
-       gchar *buf;
+       char *buf;
 
-       buf = (gchar *) &obex->tx_buf[obex->tx_sent];
+       buf = (char *) &obex->tx_buf[obex->tx_sent];
        status = g_io_channel_write_chars(obex->io, buf, obex->tx_data,
                                                        &bytes_written, err);
        if (status != G_IO_STATUS_NORMAL)
@@ -1036,14 +1036,14 @@ static gboolean read_stream(GObex *obex, GError **err)
        GIOStatus status;
        gsize rbytes, toread;
        guint16 u16;
-       gchar *buf;
+       char *buf;
 
        if (obex->rx_data >= 3)
                goto read_body;
 
        rbytes = 0;
        toread = 3 - obex->rx_data;
-       buf = (gchar *) &obex->rx_buf[obex->rx_data];
+       buf = (char *) &obex->rx_buf[obex->rx_data];
 
        status = g_io_channel_read_chars(io, buf, toread, &rbytes, NULL);
        if (status != G_IO_STATUS_NORMAL)
@@ -1069,7 +1069,7 @@ read_body:
 
        do {
                toread = obex->rx_pkt_len - obex->rx_data;
-               buf = (gchar *) &obex->rx_buf[obex->rx_data];
+               buf = (char *) &obex->rx_buf[obex->rx_data];
 
                status = g_io_channel_read_chars(io, buf, toread, &rbytes, NULL);
                if (status != G_IO_STATUS_NORMAL)
@@ -1098,7 +1098,7 @@ static gboolean read_packet(GObex *obex, GError **err)
                goto fail;
        }
 
-       status = g_io_channel_read_chars(io, (gchar *) obex->rx_buf,
+       status = g_io_channel_read_chars(io, (char *) obex->rx_buf,
                                        obex->rx_mtu, &rbytes, &read_err);
        if (status != G_IO_STATUS_NORMAL) {
                g_set_error(err, G_OBEX_ERROR, G_OBEX_ERROR_PARSE_ERROR,