Mercurial > pidgin
comparison 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 <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Tue, 26 Jul 2005 04:34:37 +0000 |
parents | 0754ce8f1122 |
children | 920a37a4c1be |
comparison
equal
deleted
inserted
replaced
11158:2c930d591492 | 11159:bd8ac1d4b2f2 |
---|---|
113 void (*request_denied)(GaimXfer *xfer); | 113 void (*request_denied)(GaimXfer *xfer); |
114 void (*start)(GaimXfer *xfer); | 114 void (*start)(GaimXfer *xfer); |
115 void (*end)(GaimXfer *xfer); | 115 void (*end)(GaimXfer *xfer); |
116 void (*cancel_send)(GaimXfer *xfer); | 116 void (*cancel_send)(GaimXfer *xfer); |
117 void (*cancel_recv)(GaimXfer *xfer); | 117 void (*cancel_recv)(GaimXfer *xfer); |
118 ssize_t (*read)(char **buffer, GaimXfer *xfer); | 118 ssize_t (*read)(guchar **buffer, GaimXfer *xfer); |
119 ssize_t (*write)(const char *buffer, size_t size, GaimXfer *xfer); | 119 ssize_t (*write)(const guchar *buffer, size_t size, GaimXfer *xfer); |
120 void (*ack)(GaimXfer *xfer, const char *buffer, size_t size); | 120 void (*ack)(GaimXfer *xfer, const guchar *buffer, size_t size); |
121 | 121 |
122 } ops; | 122 } ops; |
123 | 123 |
124 GaimXferUiOps *ui_ops; /**< UI-specific operations. */ | 124 GaimXferUiOps *ui_ops; /**< UI-specific operations. */ |
125 void *ui_data; /**< UI-specific data. */ | 125 void *ui_data; /**< UI-specific data. */ |
379 * | 379 * |
380 * @param xfer The file transfer. | 380 * @param xfer The file transfer. |
381 * @param fnc The read function. | 381 * @param fnc The read function. |
382 */ | 382 */ |
383 void gaim_xfer_set_read_fnc(GaimXfer *xfer, | 383 void gaim_xfer_set_read_fnc(GaimXfer *xfer, |
384 ssize_t (*fnc)(char **, GaimXfer *)); | 384 ssize_t (*fnc)(guchar **, GaimXfer *)); |
385 | 385 |
386 /** | 386 /** |
387 * Sets the write function for the file transfer. | 387 * Sets the write function for the file transfer. |
388 * | 388 * |
389 * @param xfer The file transfer. | 389 * @param xfer The file transfer. |
390 * @param fnc The write function. | 390 * @param fnc The write function. |
391 */ | 391 */ |
392 void gaim_xfer_set_write_fnc(GaimXfer *xfer, | 392 void gaim_xfer_set_write_fnc(GaimXfer *xfer, |
393 ssize_t (*fnc)(const char *, size_t, GaimXfer *)); | 393 ssize_t (*fnc)(const guchar *, size_t, GaimXfer *)); |
394 | 394 |
395 /** | 395 /** |
396 * Sets the acknowledge function for the file transfer. | 396 * Sets the acknowledge function for the file transfer. |
397 * | 397 * |
398 * @param xfer The file transfer. | 398 * @param xfer The file transfer. |
399 * @param fnc The acknowledge function. | 399 * @param fnc The acknowledge function. |
400 */ | 400 */ |
401 void gaim_xfer_set_ack_fnc(GaimXfer *xfer, | 401 void gaim_xfer_set_ack_fnc(GaimXfer *xfer, |
402 void (*fnc)(GaimXfer *, const char *, size_t)); | 402 void (*fnc)(GaimXfer *, const guchar *, size_t)); |
403 | 403 |
404 /** | 404 /** |
405 * Sets the function to be called if the request is denied. | 405 * Sets the function to be called if the request is denied. |
406 * | 406 * |
407 * @param xfer The file transfer. | 407 * @param xfer The file transfer. |
459 * @param xfer The file transfer. | 459 * @param xfer The file transfer. |
460 * @param buffer The buffer that will be created to contain the data. | 460 * @param buffer The buffer that will be created to contain the data. |
461 * | 461 * |
462 * @return The number of bytes read, or -1. | 462 * @return The number of bytes read, or -1. |
463 */ | 463 */ |
464 ssize_t gaim_xfer_read(GaimXfer *xfer, char **buffer); | 464 ssize_t gaim_xfer_read(GaimXfer *xfer, guchar **buffer); |
465 | 465 |
466 /** | 466 /** |
467 * Writes data to a file transfer stream. | 467 * Writes data to a file transfer stream. |
468 * | 468 * |
469 * @param xfer The file transfer. | 469 * @param xfer The file transfer. |
470 * @param buffer The buffer to read the data from. | 470 * @param buffer The buffer to read the data from. |
471 * @param size The number of bytes to write. | 471 * @param size The number of bytes to write. |
472 * | 472 * |
473 * @return The number of bytes written, or -1. | 473 * @return The number of bytes written, or -1. |
474 */ | 474 */ |
475 ssize_t gaim_xfer_write(GaimXfer *xfer, const char *buffer, size_t size); | 475 ssize_t gaim_xfer_write(GaimXfer *xfer, const guchar *buffer, size_t size); |
476 | 476 |
477 /** | 477 /** |
478 * Starts a file transfer. | 478 * Starts a file transfer. |
479 * | 479 * |
480 * Either @a fd must be specified <i>or</i> @a ip and @a port on a | 480 * Either @a fd must be specified <i>or</i> @a ip and @a port on a |