fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no need to allocate tmp_app on heap in notify_thread_app

Browse Source
This commit is contained in:
Frederic Culot 2008-04-20 13:49:39 +00:00
parent 8ba04b5220
commit cb3919c59f
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/notify.c
View File

@ -1,4 +1,4 @@
/* $calcurse: notify.c,v 1.26 2008/04/19 21:05:15 culot Exp $ */ /* $calcurse: notify.c,v 1.27 2008/04/20 13:49:39 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -267,27 +267,26 @@ notify_main_thread (void *arg)
static void * static void *
notify_thread_app (void *arg) notify_thread_app (void *arg)
{ {
struct notify_app_s *tmp_app; struct notify_app_s tmp_app;
time_t current_time; time_t current_time;
current_time = time (NULL); current_time = time (NULL);
/* Use a temporary structure not to lock the mutex for a too /* Use a temporary structure not to lock the mutex for a too
* long time while looking for next appointment. */ * long time while looking for next appointment. */
tmp_app = (struct notify_app_s *) malloc (sizeof (struct notify_app_s)); tmp_app.time = current_time + DAYINSEC;
tmp_app->time = current_time + DAYINSEC; tmp_app.got_app = 0;
tmp_app->got_app = 0; tmp_app.txt = NULL;
tmp_app->txt = NULL; tmp_app = *recur_apoint_check_next (&tmp_app, current_time, get_today ());
tmp_app = recur_apoint_check_next (tmp_app, current_time, get_today ()); tmp_app = *apoint_check_next (&tmp_app, current_time);
tmp_app = apoint_check_next (tmp_app, current_time);
pthread_mutex_lock (&notify_app->mutex); pthread_mutex_lock (&notify_app->mutex);
if (tmp_app->got_app) if (tmp_app.got_app)
{ {
notify_app->got_app = 1; notify_app->got_app = 1;
notify_app->time = tmp_app->time; notify_app->time = tmp_app.time;
notify_app->txt = mycpy (tmp_app->txt); notify_app->txt = mycpy (tmp_app.txt);
notify_app->state = tmp_app->state; notify_app->state = tmp_app.state;
} }
else else
{ {
@ -295,9 +294,8 @@ notify_thread_app (void *arg)
} }
pthread_mutex_unlock (&notify_app->mutex); pthread_mutex_unlock (&notify_app->mutex);
if (tmp_app->txt != NULL) if (tmp_app.txt != NULL)
free (tmp_app->txt); free (tmp_app.txt);
free (tmp_app);
notify_update_bar (); notify_update_bar ();
pthread_exit ((void *) 0); pthread_exit ((void *) 0);