mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Massage types a bit to silence some warnings and add a couple missing headers.

This commit is contained in:
Josh Elsasser 2007-05-27 16:31:16 +00:00
parent e24eea37a6
commit 6d9472edc8
5 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
daemon/proxy.c
View File

@ -38,6 +38,7 @@
#include "errors.h"
#include "misc.h"
#include "transmission.h"
#include "trcompat.h"
static void usage ( const char *, ... );
static enum confpathtype readargs ( int, char **, char ** );

16
gtk/io.c
View File

@ -47,16 +47,16 @@ struct iosource {
iofunc_t closed;
void *cbdata;
char *inbuf;
unsigned int inused;
unsigned int inmax;
size_t inused;
size_t inmax;
GList *outbufs;
unsigned int lastid;
};
struct iooutbuf {
char *data;
unsigned int len;
unsigned int off;
size_t len;
size_t off;
unsigned int id;
};
@ -179,7 +179,7 @@ newsource(void) {
}
unsigned int
io_send(GSource *source, const char *data, unsigned int len) {
io_send(GSource *source, const void *data, size_t len) {
char *new = g_new(char, len);
memcpy(new, data, len);
@ -188,7 +188,7 @@ io_send(GSource *source, const char *data, unsigned int len) {
}
unsigned int
io_send_keepdata(GSource *source, char *data, unsigned int len) {
io_send_keepdata(GSource *source, void *data, size_t len) {
struct iosource *io = (struct iosource*)source;
struct iooutbuf *buf = g_new(struct iooutbuf, 1);
@ -266,7 +266,7 @@ io_finalize(GSource *source SHUTUP) {
}
static void
io_biggify(char **buf, unsigned int used, unsigned int *max) {
io_biggify(char **buf, size_t used, size_t *max) {
if(used + IO_BLOCKSIZE > *max) {
*max += IO_BLOCKSIZE;
*buf = g_renew(char, *buf, *max);
@ -292,7 +292,7 @@ static void
io_read(struct iosource *io) {
ssize_t res = 0;
gboolean newdata = FALSE;
unsigned int used;
size_t used;
int err = 0;
g_source_ref((GSource*)io);

8
gtk/io.h
View File

@ -26,8 +26,8 @@
#define TG_IO_H
typedef void (*iofunc_t)(GSource*, void*);
typedef void (*ioidfunc_t)(GSource*, unsigned int, void*);
typedef unsigned int (*iodatafunc_t)(GSource*, char*, unsigned int, void*);
typedef void (*ioidfunc_t)(GSource*, size_t, void*);
typedef size_t (*iodatafunc_t)(GSource*, void*, size_t, void*);
typedef void (*ionewfunc_t)(GSource*, int, struct sockaddr*, socklen_t, void*);
GSource *
@ -39,9 +39,9 @@ io_new_listening(int fd, socklen_t len, ionewfunc_t accepted,
iofunc_t closed, void *cbdata);
unsigned int
io_send(GSource *source, const char *data, unsigned int len);
io_send(GSource *source, const void *data, size_t len);
unsigned int
io_send_keepdata(GSource *source, char *data, unsigned int len);
io_send_keepdata(GSource *source, void *data, size_t len);
#endif /* TG_IO_H */

31
gtk/ipc.c
View File

@ -88,10 +88,10 @@ client_connect(char *path, struct constate *con);
static void
srv_io_accept(GSource *source, int fd, struct sockaddr *sa, socklen_t len,
void *vdata);
static unsigned int
srv_io_received(GSource *source, char *data, unsigned int len, void *vdata);
static unsigned int
cli_io_received(GSource *source, char *data, unsigned int len, void *vdata);
static size_t
srv_io_received( GSource * source, void * data, size_t len, void * vdata );
static size_t
cli_io_received( GSource * source, void * data, size_t len, void * vdata );
static void
client_sendmsg( struct constate * con );
static void
@ -99,7 +99,7 @@ destroycon(struct constate *con);
static void
all_io_closed(GSource *source, void *vdata);
static void
cli_io_sent(GSource *source, unsigned int id, void *vdata);
cli_io_sent( GSource * source, size_t id, void * vdata );
static void
smsg_add( enum ipc_msg id, benc_val_t * val, int64_t tag, void * arg );
static void
@ -371,9 +371,9 @@ srv_io_accept(GSource *source SHUTUP, int fd, struct sockaddr *sa SHUTUP,
io_send_keepdata( newcon->source, buf, size );
}
static unsigned int
srv_io_received( GSource * source SHUTUP, char * data, unsigned int len,
void * vdata)
static size_t
srv_io_received( GSource * source SHUTUP, void * data, size_t len,
void * vdata )
{
struct constate * con = vdata;
struct constate_serv * srv = &con->u.serv;
@ -412,8 +412,8 @@ srv_io_received( GSource * source SHUTUP, char * data, unsigned int len,
return res;
}
static unsigned int
cli_io_received( GSource * source SHUTUP, char * data, unsigned int len,
static size_t
cli_io_received( GSource * source SHUTUP, void * data, size_t len,
void * vdata )
{
struct constate * con = vdata;
@ -532,7 +532,8 @@ all_io_closed(GSource *source SHUTUP, void *vdata) {
}
static void
cli_io_sent(GSource *source SHUTUP, unsigned int id, void *vdata) {
cli_io_sent( GSource * source SHUTUP, size_t id, void *vdata )
{
struct constate_client *cli = &((struct constate*)vdata)->u.client;
if(0 < id && cli->msgid == id) {
@ -621,13 +622,13 @@ smsg_addone( enum ipc_msg id SHUTUP, benc_val_t * val, int64_t tag,
{
if( NULL == dir )
{
tr_core_add_data( srv->core, data->val.s.s, data->val.s.i,
paused );
tr_core_add_data( srv->core, (uint8_t *) data->val.s.s,
data->val.s.i, paused );
}
else
{
tr_core_add_data_dir( srv->core, data->val.s.s, data->val.s.i,
dir->val.s.s, paused );
tr_core_add_data_dir( srv->core, (uint8_t *) data->val.s.s,
data->val.s.i, dir->val.s.s, paused );
}
}
tr_core_torrents_added( TR_CORE( srv->core ) );

3
gtk/tr_core.c
View File

@ -22,6 +22,7 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#include <stdint.h>
#include <string.h>
#include <gtk/gtk.h>
@ -195,7 +196,7 @@ tr_core_marshal_data( GClosure * closure, GValue * ret SHUTUP, guint count,
g_return_if_fail( 4 == count );
inst = g_value_peek_pointer( vals );
data = (char *) g_value_get_string( vals + 1 );
data = (uint8_t *) g_value_get_string( vals + 1 );
size = g_value_get_uint( vals + 2 );
paused = g_value_get_boolean( vals + 3 );
gdata = closure->data;