vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

player: merge sync_connect and purge_and_rerequest

Browse Source 
This function has only one call-site, and is trivial. Inline it
into it's caller instead.
This commit is contained in:
Erik Faye-Lund 2011-01-26 22:08:38 +01:00
parent 0c8cc404ff
commit 94a88abab0
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sync/device.c
View File

@ -217,9 +217,16 @@ static int handle_del_key_cmd(SOCKET sock, struct sync_data *data)
return sync_del_key(data->tracks[track], row); return sync_del_key(data->tracks[track], row);
} }
static int purge_and_rerequest(struct sync_device *d) int sync_connect(struct sync_device *d, const char *host, unsigned short port)
{ {
int i; int i;
if (d->sock != INVALID_SOCKET)
closesocket(d->sock);
d->sock = server_connect(host, port);
if (d->sock == INVALID_SOCKET)
return -1;
for (i = 0; i < (int)d->data.num_tracks; ++i) { for (i = 0; i < (int)d->data.num_tracks; ++i) {
free(d->data.tracks[i]->keys); free(d->data.tracks[i]->keys);
d->data.tracks[i]->keys = NULL; d->data.tracks[i]->keys = NULL;
@ -231,18 +238,6 @@ static int purge_and_rerequest(struct sync_device *d)
return 0; return 0;
} }
int sync_connect(struct sync_device *d, const char *host, unsigned short port)
{
if (d->sock != INVALID_SOCKET)
closesocket(d->sock);
d->sock = server_connect(host, port);
if (d->sock == INVALID_SOCKET)
return -1;
return purge_and_rerequest(d);
}
int sync_update(struct sync_device *d, int row, struct sync_cb *cb, int sync_update(struct sync_device *d, int row, struct sync_cb *cb,
void *cb_param) void *cb_param)
{ {