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

function pointer type correctness. mikedld

This commit is contained in:
Jordan Lee 2013-09-08 17:08:18 +00:00
parent 605e2e89ad
commit 4c8bda8805
15 changed files with 56 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/file-list.c
View File

@ -881,7 +881,7 @@ cell_edited_callback (GtkCellRendererText * cell G_GNUC_UNUSED,
rename_data->newname = g_strdup (newname);
rename_data->file_data = data;
rename_data->path_string = g_strdup (path_string);
tr_torrentRenamePath (tor, oldpath->str, newname, (tr_torrent_rename_done_func*)on_rename_done, rename_data);
tr_torrentRenamePath (tor, oldpath->str, newname, (tr_torrent_rename_done_func)on_rename_done, rename_data);
/* cleanup */
g_string_free (oldpath, TRUE);

8
libtransmission/announcer-common.h
View File

@ -96,8 +96,8 @@ typedef struct
}
tr_scrape_response;
typedef void tr_scrape_response_func (const tr_scrape_response * response,
void * user_data);
typedef void (*tr_scrape_response_func) (const tr_scrape_response * response,
void * user_data);
void tr_tracker_http_scrape (tr_session * session,
const tr_scrape_request * req,
@ -223,8 +223,8 @@ typedef struct
}
tr_announce_response;
typedef void tr_announce_response_func (const tr_announce_response * response,
void * userdata);
typedef void (*tr_announce_response_func) (const tr_announce_response * response,
void * userdata);
void tr_tracker_http_announce (tr_session * session,
const tr_announce_request * req,

4
libtransmission/announcer-http.c
View File

@ -164,7 +164,7 @@ listToPex (tr_variant * peerList, size_t * setme_len)
struct announce_data
{
tr_announce_response response;
tr_announce_response_func * response_func;
tr_announce_response_func response_func;
void * response_func_user_data;
char log_name[128];
};
@ -318,7 +318,7 @@ tr_tracker_http_announce (tr_session * session,
struct scrape_data
{
tr_scrape_response response;
tr_scrape_response_func * response_func;
tr_scrape_response_func response_func;
void * response_func_user_data;
char log_name[128];
};

4
libtransmission/announcer-udp.c
View File

@ -156,7 +156,7 @@ struct tau_scrape_request
tau_transaction_t transaction_id;
tr_scrape_response response;
tr_scrape_response_func * callback;
tr_scrape_response_func callback;
void * user_data;
};
@ -286,7 +286,7 @@ struct tau_announce_request
tau_transaction_t transaction_id;
tr_announce_response response;
tr_announce_response_func * callback;
tr_announce_response_func callback;
void * user_data;
};

8
libtransmission/announcer.h
View File

@ -56,9 +56,9 @@ typedef struct
}
tr_tracker_event;
typedef void tr_tracker_callback (tr_torrent * tor,
const tr_tracker_event * event,
void * client_data);
typedef void (*tr_tracker_callback) (tr_torrent * tor,
const tr_tracker_event * event,
void * client_data);
/**
*** Session ctor/dtor
@ -73,7 +73,7 @@ void tr_announcerClose (tr_session *);
**/
struct tr_torrent_tiers * tr_announcerAddTorrent (tr_torrent * torrent,
tr_tracker_callback * cb,
tr_tracker_callback cb,
void * cbdata);
bool tr_announcerHasBacklog (const struct tr_announcer *);

6
libtransmission/peer-common.h
View File

@ -75,9 +75,9 @@ tr_peer_event;
extern const tr_peer_event TR_PEER_EVENT_INIT;
typedef void tr_peer_callback (struct tr_peer * peer,
const tr_peer_event * event,
void * client_data);
typedef void (*tr_peer_callback) (struct tr_peer * peer,
const tr_peer_event * event,
void * client_data);
/***
****

2
libtransmission/peer-msgs.h
View File

@ -41,7 +41,7 @@ tr_peerMsgs* tr_peerMsgsCast (void * msgs);
tr_peerMsgs* tr_peerMsgsNew (struct tr_torrent * torrent,
struct tr_peerIo * io,
tr_peer_callback * callback,
tr_peer_callback callback,
void * callback_data);
bool tr_peerMsgsIsPeerChoked (const tr_peerMsgs * msgs);

4
libtransmission/session.h
View File

@ -58,8 +58,6 @@ struct tr_cache;
struct tr_fdInfo;
struct tr_device_info;
typedef void (tr_web_config_func)(tr_session * session, void * curl_pointer, const char * url, void * user_data);
struct tr_turtle_info
{
/* TR_UP and TR_DOWN speed limits */
@ -81,7 +79,7 @@ struct tr_turtle_info
tr_sched_day days;
/* called when isEnabled changes */
tr_altSpeedFunc * callback;
tr_altSpeedFunc callback;
/* the callback's user_data argument */
void * callbackUserData;

8
libtransmission/torrent.c
View File

@ -1939,9 +1939,9 @@ tr_torrentFree (tr_torrent * tor)
struct remove_data
{
tr_torrent * tor;
bool deleteFlag;
tr_fileFunc * deleteFunc;
tr_torrent * tor;
bool deleteFlag;
tr_fileFunc deleteFunc;
};
static void tr_torrentDeleteLocalData (tr_torrent *, tr_fileFunc);
@ -3696,7 +3696,7 @@ struct rename_data
tr_torrent * tor;
char * oldpath;
char * newname;
tr_torrent_rename_done_func * callback;
tr_torrent_rename_done_func callback;
void * callback_user_data;
};

10
libtransmission/torrent.h
View File

@ -228,16 +228,16 @@ struct tr_torrent
int queuePosition;
tr_torrent_metadata_func * metadata_func;
tr_torrent_metadata_func metadata_func;
void * metadata_func_user_data;
tr_torrent_completeness_func * completeness_func;
void * completeness_func_user_data;
tr_torrent_completeness_func completeness_func;
void * completeness_func_user_data;
tr_torrent_ratio_limit_hit_func * ratio_limit_hit_func;
tr_torrent_ratio_limit_hit_func ratio_limit_hit_func;
void * ratio_limit_hit_func_user_data;
tr_torrent_idle_limit_hit_func * idle_limit_hit_func;
tr_torrent_idle_limit_hit_func idle_limit_hit_func;
void * idle_limit_hit_func_user_data;
void * queue_started_user_data;

36
libtransmission/transmission.h
View File

@ -651,13 +651,13 @@ tr_sched_day;
void tr_sessionSetAltSpeedDay (tr_session *, tr_sched_day day);
tr_sched_day tr_sessionGetAltSpeedDay (const tr_session *);
typedef void (tr_altSpeedFunc)(tr_session *,
typedef void (*tr_altSpeedFunc)(tr_session *,
bool active,
bool userDriven,
void *);
void tr_sessionClearAltSpeedFunc (tr_session *);
void tr_sessionSetAltSpeedFunc (tr_session *, tr_altSpeedFunc *, void *);
void tr_sessionSetAltSpeedFunc (tr_session *, tr_altSpeedFunc, void *);
bool tr_sessionGetActiveSpeedLimit_KBps (const tr_session * session,
@ -1106,7 +1106,7 @@ tr_torrent * tr_torrentNew (const tr_ctor * ctor,
/** @addtogroup tr_torrent Torrents
@{ */
typedef int tr_fileFunc (const char * filename);
typedef int (*tr_fileFunc) (const char * filename);
/** @brief Removes our .torrent and .resume files for this torrent */
void tr_torrentRemove (tr_torrent * torrent,
@ -1120,11 +1120,11 @@ void tr_torrentStart (tr_torrent * torrent);
void tr_torrentStop (tr_torrent * torrent);
typedef void (tr_torrent_rename_done_func)(tr_torrent * torrent,
const char * oldpath,
const char * newname,
int error,
void * user_data);
typedef void (*tr_torrent_rename_done_func)(tr_torrent * torrent,
const char * oldpath,
const char * newname,
int error,
void * user_data);
/**
* @brief Rename a file or directory in a torrent.
@ -1432,17 +1432,17 @@ tr_completeness;
* @param wasRunning whether or not the torrent was running when
* it changed its completeness state
*/
typedef void (tr_torrent_completeness_func)(tr_torrent * torrent,
tr_completeness completeness,
bool wasRunning,
void * user_data);
typedef void (*tr_torrent_completeness_func)(tr_torrent * torrent,
tr_completeness completeness,
bool wasRunning,
void * user_data);
typedef void (tr_torrent_ratio_limit_hit_func)(tr_torrent * torrent,
typedef void (*tr_torrent_ratio_limit_hit_func)(tr_torrent * torrent,
void * user_data);
typedef void (*tr_torrent_idle_limit_hit_func)(tr_torrent * torrent,
void * user_data);
typedef void (tr_torrent_idle_limit_hit_func)(tr_torrent * torrent,
void * user_data);
/**
* Register to be notified whenever a torrent's "completeness"
@ -1466,8 +1466,8 @@ void tr_torrentClearCompletenessCallback (tr_torrent * torrent);
typedef void (tr_torrent_metadata_func)(tr_torrent * torrent,
void * user_data);
typedef void (*tr_torrent_metadata_func)(tr_torrent * torrent,
void * user_data);
/**
* Register to be notified whenever a torrent changes from
* having incomplete metadata to having complete metadata.

2
libtransmission/web.c
View File

@ -76,7 +76,7 @@ struct tr_web_task
char * range;
char * cookies;
tr_session * session;
tr_web_done_func * done_func;
tr_web_done_func done_func;
void * done_func_user_data;
CURL * curl_easy;
struct tr_web_task * next;

14
libtransmission/web.h
View File

@ -39,13 +39,13 @@ tr_web_close_mode;
void tr_webClose (tr_session * session, tr_web_close_mode close_mode);
typedef void (tr_web_done_func)(tr_session * session,
bool timeout_flag,
bool did_connect_flag,
long response_code,
const void * response,
size_t response_byte_count,
void * user_data);
typedef void (*tr_web_done_func)(tr_session * session,
bool timeout_flag,
bool did_connect_flag,
long response_code,
const void * response,
size_t response_byte_count,
void * user_data);
const char * tr_webGetResponseStr (long response_code);

4
libtransmission/webseed.c
View File

@ -48,7 +48,7 @@ struct tr_webseed
tr_peer parent;
tr_bandwidth bandwidth;
tr_session * session;
tr_peer_callback * callback;
tr_peer_callback callback;
void * callback_data;
tr_list * tasks;
struct event * timer;
@ -595,7 +595,7 @@ static const struct tr_peer_virtual_funcs my_funcs =
tr_webseed*
tr_webseedNew (struct tr_torrent * tor,
const char * url,
tr_peer_callback * callback,
tr_peer_callback callback,
void * callback_data)
{
tr_webseed * w = tr_new0 (tr_webseed, 1);

2
libtransmission/webseed.h
View File

@ -23,7 +23,7 @@ typedef struct tr_webseed tr_webseed;
tr_webseed* tr_webseedNew (struct tr_torrent * torrent,
const char * url,
tr_peer_callback * callback,
tr_peer_callback callback,
void * callback_data);
#endif