Centralize setting up atexit(Epplet_cleanup)

api/epplet.c

@@ -560,6 +560,8 @@ Epplet_Init(const char *name, const char *version, const char *info,
    sa.sa_flags = SA_RESTART;
    sigemptyset(&sa.sa_mask);
    sigaction(SIGCHLD, &sa, (struct sigaction *)0);
+
+   atexit(Epplet_cleanup);
 }
 
 static              Window

epplets/ConfigTestEpplet.c

@@ -6,7 +6,6 @@ cb_close(void *data __UNUSED__)
 {
    Epplet_unremember();
    Esync();
-   Epplet_cleanup();
    exit(0);
 }
 

epplets/E-Areas.c

@@ -77,7 +77,6 @@ main(int argc, char **argv)
 {
    Epplet_gadget       b_up, b_down, b_left, b_right;
 
-   atexit(Epplet_cleanup);
    Epplet_Init("E-Areas", "0.1",
 	       "A desktop areas navigator; John Slee <john@chirp.com.au>",
 	       3, 3, argc, argv, 0);

epplets/E-Bandwidth.c

@@ -265,7 +265,6 @@ main(int argc, char **argv)
 {
    Epplet_adjust_priority(10);
 
-   atexit(Epplet_cleanup);
    Epplet_Init("E-Bandwidth", "0.2", "Enlightenment Network I/O Monitor Epplet",
 	       3, 3, argc, argv, 0);
    Epplet_load_config();

epplets/E-Biff.c

@@ -419,7 +419,6 @@ main(int argc, char **argv)
 {
    Epplet_adjust_priority(10);
 
-   atexit(Epplet_cleanup);
    Epplet_Init("E-Biff", "0.5", "Enlightenment Mailbox Checker Epplet", 3, 3,
 	       argc, argv, 0);
    Epplet_load_config();

epplets/E-Clock.c

@@ -104,7 +104,6 @@ draw_arms(void)
 int
 main(int argc, char **argv)
 {
-   atexit(Epplet_cleanup);
    Epplet_Init("E-Clock", "0.1", "Enlightenment Clock Epplet",
 	       3, 3, argc, argv, 0);
    Epplet_timer(cb_timer, NULL, 0.5, "TIMER");

epplets/E-Cpu.c

@@ -418,8 +418,6 @@ main(int argc, char **argv)
 
    Epplet_adjust_priority(10);
 
-   atexit(Epplet_cleanup);
-
    cpus = count_cpus();
    load_val = calloc(cpus, sizeof(int));
    prev_val = calloc(cpus, sizeof(double));

epplets/E-Disk.c

@@ -243,7 +243,6 @@ main(int argc, char **argv)
 {
    Epplet_adjust_priority(10);
 
-   atexit(Epplet_cleanup);
    Epplet_Init("E-Disk", "0.2", "Enlightenment Disk I/O Monitor Epplet", 3, 3,
 	       argc, argv, 0);
    Epplet_load_config();

epplets/E-Exec.c

@@ -233,8 +233,6 @@ cb_configure(void *data __UNUSED__)
 int
 main(int argc, char *argv[])
 {
-   atexit(Epplet_cleanup);
-
    if ((argc > 1) && (!strcmp("--proper-size", argv[1])))
      {
 	Epplet_Init(EPPLET_NAME, EPPLET_VERSION, EPPLET_INFO, 6, 3, argc, argv,

epplets/E-Load.c

@@ -135,7 +135,6 @@ main(int argc, char **argv)
 {
    int                 i;
 
-   atexit(Epplet_cleanup);
    cpus = count_cpus();
    load_val = malloc(sizeof(int) * cpus);
    prev_val = malloc(sizeof(double) * cpus);

epplets/E-LoadMeter.c

@@ -98,8 +98,6 @@ delete_cb(void *data __UNUSED__, Window win __UNUSED__)
 int
 main(int argc, char **argv)
 {
-   atexit(Epplet_cleanup);
-
    Epplet_Init("E-LoadMeter", "0.1", "Enlightenment CPU Load Epplet", 3, 3,
 	       argc, argv, 0);
 

epplets/E-Magic.c

@@ -318,7 +318,6 @@ main(int argc, char **argv)
    int                 w = 6, h = 3;
 
    srand(getpid() ^ time(NULL));
-   atexit(Epplet_cleanup);
 
    Epplet_Init("E-Magic", "0.1", "Enlightenment Magic Eight Ball Epplet", w, h,
 	       argc, argv, 0);

epplets/E-Mixer.c

@@ -302,8 +302,6 @@ main(int argc, char **argv)
 {
    int                 i;
 
-   atexit(Epplet_cleanup);
-
 #ifdef SGI_AUDIO
    openMixer("audout");
 #else

epplets/E-MoonClock.c

@@ -101,8 +101,6 @@ main(int argc, char **argv)
 {
    Epplet_adjust_priority(10);
 
-   atexit(Epplet_cleanup);
-
    Epplet_Init("E-MoonClock", "0.1", "Enlightenment MoonClock Epplet", 3, 3,
 	       argc, argv, 0);
    Epplet_load_config();

epplets/E-Mountbox.c

@@ -1773,7 +1773,6 @@ SyncConfigs(void)
 int
 main(int argc, char **argv)
 {
-   atexit(Epplet_cleanup);
    Epplet_Init("E-Mountbox", "0.1", "Enlightenment Mount Epplet",
 	       3, 3, argc, argv, 0);
    Epplet_load_config();

epplets/E-Net.c

@@ -104,8 +104,6 @@ main(int argc, char **argv)
 
    Epplet_adjust_priority(10);
 
-   atexit(Epplet_cleanup);
-
    Epplet_Init("E-Net", "0.1", "Enlightenment Network Load Epplet",
 	       5, 2, argc, argv, 0);
    Epplet_load_config();

epplets/E-NetFlame.c

@@ -391,8 +391,6 @@ main(int argc, char **argv)
 
    Epplet_adjust_priority(10);
 
-   atexit(Epplet_cleanup);
-
    load_val = calloc(DIVISIONS, sizeof(int));
    prev_val = calloc(DIVISIONS, sizeof(double));
 

epplets/E-NetGraph.c

@@ -408,7 +408,6 @@ main(int argc, char **argv)
 
    Epplet_load_config();
    load_config();
-   atexit(Epplet_cleanup);
 
    while (i < argc)
      {

epplets/E-OpenGL-Demo.c

@@ -379,8 +379,6 @@ main(int argc, char **argv)
     * bit to the sign since the texture is 8 bits per color component. */
    GLubyte             textureArray[3 * 64 * 64];
 
-   atexit(Epplet_cleanup);
-
    Epplet_Init("E-OpenGL-Demo", "0.1", "Enlightenment OpenGL Demo",
 	       4, 4, argc, argv, 0);
    Epplet_load_config();

epplets/E-Pants.c

@@ -190,8 +190,6 @@ cb_timer(void *data __UNUSED__)
 int
 main(int argc, char **argv)
 {
-   atexit(Epplet_cleanup);
-
    Epplet_Init("E-Pants", "0.1", "Enlightenment Pants Epplet",
 	       4, 1, argc, argv, 0);
    Epplet_timer(cb_timer, NULL, 0.05, "TIMER");

epplets/E-Pinger.c

@@ -452,8 +452,6 @@ main(int argc, char **argv)
 {
    int                 filedes[2];
 
-   atexit(Epplet_cleanup);
-
    Epplet_Init("E-Pinger", "0.1", "Enlightenment Pinger Epplet",
 	       6, 1, argc, argv, 0);
    Epplet_timer(cb_timer, NULL, 0.05, "TIMER");

epplets/E-PlayCD.c

@@ -534,8 +534,6 @@ main(int argc, char **argv)
 
    Epplet_adjust_priority(10);
 
-   atexit(Epplet_cleanup);
-
    Epplet_Init("E-PlayCD", "0.5",
 	       "Enlightenment CD Player Epplet", 5, 3, argc, argv, 0);
    Epplet_load_config();

epplets/E-Power.c

@@ -455,7 +455,6 @@ main(int argc, char **argv)
 
    Epplet_Init("E-Power", "0.1", "Enlightenment Laptop Power Epplet",
 	       3, 3, argc, argv, 0);
-   atexit(Epplet_cleanup);
    Epplet_timer(cb_timer, NULL, 10.0, "TIMER");
    b_close = Epplet_create_button(NULL, NULL,
 				  2, 2, 0, 0, "CLOSE", 0, NULL, cb_close, NULL);

epplets/E-SD.c

@@ -526,25 +526,17 @@ create_epplet_layout(void)
    Epplet_register_mouse_leave_handler(cb_out, NULL);
 }
 
-static void
-clean_exit(void)
-{
-   save_config();
-   Epplet_cleanup();
-}
-
 int
 main(int argc, char **argv)
 {
    Epplet_adjust_priority(10);
 
-   atexit(clean_exit);
-
    /* Initialise random numbers */
    srand(time(0));
 
    Epplet_Init("E-SD", "0.4", "Enlightenment ESD Monitor", 3, 3, argc, argv, 0);
    Epplet_load_config();
+   atexit(save_config);
 
    esd.fd =
       esd_monitor_stream(ESD_BITS16 | ESD_STEREO | ESD_STREAM | ESD_PLAY,

epplets/E-ScreenSave.c

@@ -597,24 +597,17 @@ create_epplet_layout(void)
    Epplet_register_delete_event_handler(delete_cb, NULL);
 }
 
-static void
-clean_exit(void)
-{
-   save_config();
-   Epplet_cleanup();
-}
-
 int
 main(int argc, char **argv)
 {
    Epplet_adjust_priority(10);
 
-   atexit(clean_exit);
    /* Initialise random numbers */
    srand(time(0));
    Epplet_Init("E-ScreenSave", "0.7",
 	       "Enlightenment Screen Savin' Epplet", 3, 3, argc, argv, 0);
    Epplet_load_config();
+   atexit(save_config);
    load_config();
    create_epplet_layout();
    Epplet_show();

epplets/E-ScreenShoot.c

@@ -933,25 +933,17 @@ create_epplet_layout(void)
    Epplet_register_mouse_leave_handler(cb_out, NULL);
 }
 
-static void
-clean_exit(void)
-{
-   save_config();
-   Epplet_cleanup();
-}
-
 int
 main(int argc, char **argv)
 {
    Epplet_adjust_priority(10);
 
-   atexit(clean_exit);
-
    /* Initialise random numbers */
    srand(time(0));
 
    Epplet_Init("E-ScreenShoot", "0.7", "Enlightenment Screen Shootin' Epplet",
 	       3, 3, argc, argv, 0);
+   atexit(save_config);
    Epplet_load_config();
 
    load_config();

epplets/E-Slides.c

@@ -688,7 +688,6 @@ main(int argc, char **argv)
 
    Epplet_adjust_priority(10);
 
-   atexit(Epplet_cleanup);
    srand(getpid() * time(NULL) % ((unsigned int)-1));
 
    for (j = 1; j < argc; j++)

epplets/E-Sys.c

@@ -123,8 +123,6 @@ main(int argc, char **argv)
 {
    Epplet_adjust_priority(10);
 
-   atexit(Epplet_cleanup);
-
    Epplet_Init("E-Sys", "0.1", "Enlightenment Uptime Epplet", 3, 3, argc, argv,
 	       0);
 

epplets/E-Time.c

@@ -226,8 +226,6 @@ parse_config(void)
 int
 main(int argc, char **argv)
 {
-   atexit(Epplet_cleanup);
-
    Epplet_Init("E-Time", "0.1", "Enlightenment Digital Clock Epplet", 3, 3,
 	       argc, argv, 0);
    Epplet_load_config();

epplets/E-Toolbox.c

@@ -690,7 +690,6 @@ main(int argc, char **argv)
    int                 j = 0, c = 0;
 
    prog_name = argv[0];
-   atexit(Epplet_cleanup);
 
    for (j = 1; j < argc; j++)
      {

epplets/E-UrlWatch.c

@@ -766,13 +766,6 @@ create_epplet_layout(void)
    display_string("Welcome to E-UrlWatch ;-)");
 }
 
-static void
-clean_exit(void)
-{
-   save_config();
-   Epplet_cleanup();
-}
-
 static void
 in_cb(void *data __UNUSED__, Window w)
 {
@@ -816,11 +809,10 @@ main(int argc, char **argv)
 {
    Epplet_adjust_priority(10);
 
-   atexit(clean_exit);
-
    Epplet_Init("E-UrlWatch", "0.1",
 	       "Enlightenment Url Watcher Epplet", 6, 3, argc, argv, 0);
    Epplet_load_config();
+   atexit(save_config);
    load_config();
    create_epplet_layout();
    Epplet_register_focus_in_handler(in_cb, NULL);

epplets/E-Wireless.c

@@ -225,8 +225,6 @@ main(int argc, char *argv[])
 
    Epplet_adjust_priority(10);
 
-   atexit(Epplet_cleanup);
-
    cpu_hist_size = WIDTH;
    cpu_hist = (int *)malloc(sizeof(int) * cpu_hist_size);
    memset(cpu_hist, 0x00, sizeof(int) * cpu_hist_size);

epplets/E-Xss.c

@@ -331,8 +331,6 @@ main(int argc, char **argv)
 {
    Epplet_adjust_priority(10);
 
-   atexit(Epplet_cleanup);
-
    Epplet_Init("E-Xss", "0.2", "Enlightenment Xscreensaver Epplet", 3, 3, argc,
 	       argv, 0);
    Epplet_load_config();

epplets/Emix.c

@@ -151,7 +151,6 @@ main(int argc, char *argv[])
       return 1;
    initialize_channels();
 
-   atexit(Epplet_cleanup);
    Epplet_Init("Emix", "0.9", "Audio mixer Epplet", 3, 3, argc, argv, 0);
    vs_master = Epplet_create_vslider(2, 2, 44, 0, 20, 1, 5,
 				     &channels[0].value, set_volume,

epplets/TestEpplet.c

@@ -35,7 +35,6 @@ cb_close(void *data __UNUSED__)
 {
    Epplet_unremember();
    Esync();
-   Epplet_cleanup();
    exit(0);
 }