Mercurial > pidgin.yaz
comparison src/ft.c @ 12151:de798f2f4bf1
[gaim-migrate @ 14452]
Sort out the ft.h include situation. I changed from ssize_t to gssize in the file transfer stuff.
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 19 Nov 2005 03:16:49 +0000 |
parents | 525cf7ecd919 |
children | 5e2a365af01b |
comparison
equal
deleted
inserted
replaced
12150:e91f3f06a435 | 12151:de798f2f4bf1 |
---|---|
691 | 691 |
692 xfer->ops.request_denied = fnc; | 692 xfer->ops.request_denied = fnc; |
693 } | 693 } |
694 | 694 |
695 void | 695 void |
696 gaim_xfer_set_read_fnc(GaimXfer *xfer, ssize_t (*fnc)(guchar **, GaimXfer *)) | 696 gaim_xfer_set_read_fnc(GaimXfer *xfer, gssize (*fnc)(guchar **, GaimXfer *)) |
697 { | 697 { |
698 g_return_if_fail(xfer != NULL); | 698 g_return_if_fail(xfer != NULL); |
699 | 699 |
700 xfer->ops.read = fnc; | 700 xfer->ops.read = fnc; |
701 } | 701 } |
702 | 702 |
703 void | 703 void |
704 gaim_xfer_set_write_fnc(GaimXfer *xfer, | 704 gaim_xfer_set_write_fnc(GaimXfer *xfer, |
705 ssize_t (*fnc)(const guchar *, size_t, GaimXfer *)) | 705 gssize (*fnc)(const guchar *, size_t, GaimXfer *)) |
706 { | 706 { |
707 g_return_if_fail(xfer != NULL); | 707 g_return_if_fail(xfer != NULL); |
708 | 708 |
709 xfer->ops.write = fnc; | 709 xfer->ops.write = fnc; |
710 } | 710 } |
748 g_return_if_fail(xfer != NULL); | 748 g_return_if_fail(xfer != NULL); |
749 | 749 |
750 xfer->ops.cancel_recv = fnc; | 750 xfer->ops.cancel_recv = fnc; |
751 } | 751 } |
752 | 752 |
753 ssize_t | 753 gssize |
754 gaim_xfer_read(GaimXfer *xfer, guchar **buffer) | 754 gaim_xfer_read(GaimXfer *xfer, guchar **buffer) |
755 { | 755 { |
756 ssize_t s, r; | 756 gssize s, r; |
757 | 757 |
758 g_return_val_if_fail(xfer != NULL, 0); | 758 g_return_val_if_fail(xfer != NULL, 0); |
759 g_return_val_if_fail(buffer != NULL, 0); | 759 g_return_val_if_fail(buffer != NULL, 0); |
760 | 760 |
761 if (gaim_xfer_get_size(xfer) == 0) | 761 if (gaim_xfer_get_size(xfer) == 0) |
777 } | 777 } |
778 | 778 |
779 return r; | 779 return r; |
780 } | 780 } |
781 | 781 |
782 ssize_t | 782 gssize |
783 gaim_xfer_write(GaimXfer *xfer, const guchar *buffer, size_t size) | 783 gaim_xfer_write(GaimXfer *xfer, const guchar *buffer, size_t size) |
784 { | 784 { |
785 ssize_t r, s; | 785 gssize r, s; |
786 | 786 |
787 g_return_val_if_fail(xfer != NULL, 0); | 787 g_return_val_if_fail(xfer != NULL, 0); |
788 g_return_val_if_fail(buffer != NULL, 0); | 788 g_return_val_if_fail(buffer != NULL, 0); |
789 g_return_val_if_fail(size != 0, 0); | 789 g_return_val_if_fail(size != 0, 0); |
790 | 790 |
805 transfer_cb(gpointer data, gint source, GaimInputCondition condition) | 805 transfer_cb(gpointer data, gint source, GaimInputCondition condition) |
806 { | 806 { |
807 GaimXferUiOps *ui_ops; | 807 GaimXferUiOps *ui_ops; |
808 GaimXfer *xfer = (GaimXfer *)data; | 808 GaimXfer *xfer = (GaimXfer *)data; |
809 guchar *buffer = NULL; | 809 guchar *buffer = NULL; |
810 ssize_t r = 0; | 810 gssize r = 0; |
811 | 811 |
812 if (condition & GAIM_INPUT_READ) { | 812 if (condition & GAIM_INPUT_READ) { |
813 r = gaim_xfer_read(xfer, &buffer); | 813 r = gaim_xfer_read(xfer, &buffer); |
814 if (r > 0) { | 814 if (r > 0) { |
815 fwrite(buffer, 1, r, xfer->dest_fp); | 815 fwrite(buffer, 1, r, xfer->dest_fp); |