Work on allocating and freeing memory associated with user's data for the daemon.
This commit is contained in:
parent
f0005f64dc
commit
b45a8bfbb4
@ -1,3 +1,10 @@
|
|||||||
|
2009-07-27 Frederic Culot <frederic@culot.org>
|
||||||
|
|
||||||
|
* src/utils.c (free_user_data): new function
|
||||||
|
|
||||||
|
* src/dmon.c: work on allocating and freeing memory associated
|
||||||
|
with user data
|
||||||
|
|
||||||
2009-07-26 Frederic Culot <frederic@culot.org>
|
2009-07-26 Frederic Culot <frederic@culot.org>
|
||||||
|
|
||||||
* src/args.c (parse_args): check for file presence added (thanks
|
* src/args.c (parse_args): check for file presence added (thanks
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $calcurse: dmon.c,v 1.5 2009/07/26 21:03:21 culot Exp $ */
|
/* $calcurse: dmon.c,v 1.6 2009/07/27 19:35:09 culot Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Calcurse - text-based organizer
|
* Calcurse - text-based organizer
|
||||||
@ -67,7 +67,8 @@
|
|||||||
static void
|
static void
|
||||||
dmon_sigs_hdlr (int sig)
|
dmon_sigs_hdlr (int sig)
|
||||||
{
|
{
|
||||||
notify_free_app ();
|
free_user_data ();
|
||||||
|
|
||||||
DMON_LOG (_("terminated at %s with signal %d\n"), nowstr (), sig);
|
DMON_LOG (_("terminated at %s with signal %d\n"), nowstr (), sig);
|
||||||
|
|
||||||
if (unlink (path_dpid) != 0)
|
if (unlink (path_dpid) != 0)
|
||||||
@ -164,6 +165,8 @@ dmon_start (int parent_exit_status)
|
|||||||
custom_load_conf (&conf, 0);
|
custom_load_conf (&conf, 0);
|
||||||
|
|
||||||
io_check_file (path_apts, (int *)0);
|
io_check_file (path_apts, (int *)0);
|
||||||
|
apoint_llist_init ();
|
||||||
|
recur_apoint_llist_init ();
|
||||||
io_load_app ();
|
io_load_app ();
|
||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
|
30
src/utils.c
30
src/utils.c
@ -1,4 +1,4 @@
|
|||||||
/* $calcurse: utils.c,v 1.80 2009/07/26 20:26:16 culot Exp $ */
|
/* $calcurse: utils.c,v 1.81 2009/07/27 19:35:09 culot Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Calcurse - text-based organizer
|
* Calcurse - text-based organizer
|
||||||
@ -80,17 +80,7 @@ exit_calcurse (int status)
|
|||||||
|
|
||||||
calendar_stop_date_thread ();
|
calendar_stop_date_thread ();
|
||||||
io_stop_psave_thread ();
|
io_stop_psave_thread ();
|
||||||
day_free_list ();
|
free_user_data ();
|
||||||
event_llist_free ();
|
|
||||||
event_free_bkp (ERASE_FORCE);
|
|
||||||
apoint_llist_free ();
|
|
||||||
apoint_free_bkp (ERASE_FORCE);
|
|
||||||
recur_apoint_llist_free ();
|
|
||||||
recur_event_llist_free ();
|
|
||||||
recur_apoint_free_bkp (ERASE_FORCE);
|
|
||||||
recur_event_free_bkp (ERASE_FORCE);
|
|
||||||
todo_free_list ();
|
|
||||||
notify_free_app ();
|
|
||||||
keys_free ();
|
keys_free ();
|
||||||
mem_stats ();
|
mem_stats ();
|
||||||
if (was_interactive)
|
if (was_interactive)
|
||||||
@ -104,6 +94,22 @@ exit_calcurse (int status)
|
|||||||
exit (status);
|
exit (status);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
free_user_data (void)
|
||||||
|
{
|
||||||
|
day_free_list ();
|
||||||
|
event_llist_free ();
|
||||||
|
event_free_bkp (ERASE_FORCE);
|
||||||
|
apoint_llist_free ();
|
||||||
|
apoint_free_bkp (ERASE_FORCE);
|
||||||
|
recur_apoint_llist_free ();
|
||||||
|
recur_event_llist_free ();
|
||||||
|
recur_apoint_free_bkp (ERASE_FORCE);
|
||||||
|
recur_event_free_bkp (ERASE_FORCE);
|
||||||
|
todo_free_list ();
|
||||||
|
notify_free_app ();
|
||||||
|
}
|
||||||
|
|
||||||
/* Function to exit on internal error. */
|
/* Function to exit on internal error. */
|
||||||
void
|
void
|
||||||
fatalbox (const char *errmsg)
|
fatalbox (const char *errmsg)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $calcurse: utils.h,v 1.48 2009/07/23 18:33:22 culot Exp $ */
|
/* $calcurse: utils.h,v 1.49 2009/07/27 19:35:09 culot Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Calcurse - text-based organizer
|
* Calcurse - text-based organizer
|
||||||
@ -124,6 +124,7 @@ typedef enum
|
|||||||
erase_flag_e;
|
erase_flag_e;
|
||||||
|
|
||||||
void exit_calcurse (int);
|
void exit_calcurse (int);
|
||||||
|
void free_user_data (void);
|
||||||
void fatalbox (const char *);
|
void fatalbox (const char *);
|
||||||
void warnbox (const char *);
|
void warnbox (const char *);
|
||||||
void status_mesg (char *, char *);
|
void status_mesg (char *, char *);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user