diff src/ft.h @ 11159:bd8ac1d4b2f2

[gaim-migrate @ 13246] Get rid of a bunch of gcc4 compile warnings in oscar. Here's what I'm doing: -For random bits of binary data, use guchar * -For textual data (not necessarily utf8), use gchar * This seems to be what glib and gtk do committer: Tailor Script <[e-mail]>

--- a/src/ft.h	Mon Jul 25 23:46:34 2005 +0000
+++ b/src/ft.h	Tue Jul 26 04:34:37 2005 +0000
@@ -115,9 +115,9 @@
 		void (*end)(GaimXfer *xfer);
 		void (*cancel_send)(GaimXfer *xfer);
 		void (*cancel_recv)(GaimXfer *xfer);
-		ssize_t (*read)(char **buffer, GaimXfer *xfer);
-		ssize_t (*write)(const char *buffer, size_t size, GaimXfer *xfer);
-		void (*ack)(GaimXfer *xfer, const char *buffer, size_t size);
+		ssize_t (*read)(guchar **buffer, GaimXfer *xfer);
+		ssize_t (*write)(const guchar *buffer, size_t size, GaimXfer *xfer);
+		void (*ack)(GaimXfer *xfer, const guchar *buffer, size_t size);
 
 	} ops;
 
@@ -381,7 +381,7 @@
  * @param fnc  The read function.
  */
 void gaim_xfer_set_read_fnc(GaimXfer *xfer,
-		ssize_t (*fnc)(char **, GaimXfer *));
+		ssize_t (*fnc)(guchar **, GaimXfer *));
 
 /**
  * Sets the write function for the file transfer.
@@ -390,7 +390,7 @@
  * @param fnc  The write function.
  */
 void gaim_xfer_set_write_fnc(GaimXfer *xfer,
-		ssize_t (*fnc)(const char *, size_t, GaimXfer *));
+		ssize_t (*fnc)(const guchar *, size_t, GaimXfer *));
 
 /**
  * Sets the acknowledge function for the file transfer.
@@ -399,7 +399,7 @@
  * @param fnc  The acknowledge function.
  */
 void gaim_xfer_set_ack_fnc(GaimXfer *xfer,
-		void (*fnc)(GaimXfer *, const char *, size_t));
+		void (*fnc)(GaimXfer *, const guchar *, size_t));
 
 /**
  * Sets the function to be called if the request is denied.
@@ -461,7 +461,7 @@
  *
  * @return The number of bytes read, or -1.
  */
-ssize_t gaim_xfer_read(GaimXfer *xfer, char **buffer);
+ssize_t gaim_xfer_read(GaimXfer *xfer, guchar **buffer);
 
 /**
  * Writes data to a file transfer stream.
@@ -472,7 +472,7 @@
  *
  * @return The number of bytes written, or -1.
  */
-ssize_t gaim_xfer_write(GaimXfer *xfer, const char *buffer, size_t size);
+ssize_t gaim_xfer_write(GaimXfer *xfer, const guchar *buffer, size_t size);
 
 /**
  * Starts a file transfer.