DeforaOS/Phone
DeforaOS/Phone
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hardened the management of callbacks

Browse Source
This commit is contained in:
Pierre Pronchery 2010-05-08 01:31:43 +00:00
parent 2dfa1e0cec
commit df6c2f84c3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gsm.c
View File

@ -648,6 +648,8 @@ int gsm_queue_with_error(GSM * gsm, char const * command, GSMError error)
int gsm_reset(GSM * gsm, unsigned int delay)
{
_gsm_queue_flush(gsm);
if(gsm->source != 0)
g_source_remove(gsm->source);
if(delay > 0)
gsm->source = g_timeout_add(delay, _on_reset, gsm);
else
@ -755,6 +757,7 @@ static int _parse_do(GSM * gsm, size_t * i)
{
if(strcmp(gsm->rd_buf, "OK") != 0)
return 0;
if(gsm->source != 0)
g_source_remove(gsm->source);
gsm->source = 0;
*i = gsm->rd_buf_cnt; /* XXX ugly: flush read buffer */
@ -1188,7 +1191,8 @@ static gboolean _on_reset(gpointer data)
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s()\n", __func__);
#endif
gsm->source = 0;
if(gsm->source != 0)
g_source_remove(gsm->source);
if(gsm->channel != NULL)
{
/* XXX should the file descriptor also be freed? */
@ -1205,6 +1209,7 @@ static gboolean _on_reset(gpointer data)
close(fd);
if(gsm->retry > 0)
gsm->source = g_timeout_add(gsm->retry, _on_reset, gsm);
gsm->source = 0;
return phone_error(NULL, buf, FALSE);
}
gsm->channel = g_io_channel_unix_new(fd);