kwo pushed a commit to branch master.
http://git.enlightenment.org/e16/e16-epplets.git/commit/?id=b436df8d7a6355a7c1f5dcded8c5bf810abb3d03
commit b436df8d7a6355a7c1f5dcded8c5bf810abb3d03
Author: Kim Woelders <k...@woelders.dk>
Date: Thu Aug 26 21:54:45 2021 +0200
Centralize setting up atexit(Epplet_cleanup)
---
api/epplet.c | 2 ++
epplets/ConfigTestEpplet.c | 1 -
epplets/E-Areas.c | 1 -
epplets/E-Bandwidth.c | 1 -
epplets/E-Biff.c | 1 -
epplets/E-Clock.c | 1 -
epplets/E-Cpu.c | 2 --
epplets/E-Disk.c | 1 -
epplets/E-Exec.c | 2 --
epplets/E-Load.c | 1 -
epplets/E-LoadMeter.c | 2 --
epplets/E-Magic.c | 1 -
epplets/E-Mixer.c | 2 --
epplets/E-MoonClock.c | 2 --
epplets/E-Mountbox.c | 1 -
epplets/E-Net.c | 2 --
epplets/E-NetFlame.c | 2 --
epplets/E-NetGraph.c | 1 -
epplets/E-OpenGL-Demo.c | 2 --
epplets/E-Pants.c | 2 --
epplets/E-Pinger.c | 2 --
epplets/E-PlayCD.c | 2 --
epplets/E-Power.c | 1 -
epplets/E-SD.c | 10 +---------
epplets/E-ScreenSave.c | 9 +--------
epplets/E-ScreenShoot.c | 10 +---------
epplets/E-Slides.c | 1 -
epplets/E-Sys.c | 2 --
epplets/E-Time.c | 2 --
epplets/E-Toolbox.c | 1 -
epplets/E-UrlWatch.c | 10 +---------
epplets/E-Wireless.c | 2 --
epplets/E-Xss.c | 2 --
epplets/Emix.c | 1 -
epplets/TestEpplet.c | 1 -
35 files changed, 6 insertions(+), 80 deletions(-)
diff --git a/api/epplet.c b/api/epplet.c
index bdcd146..8101264 100644
--- a/api/epplet.c
+++ b/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
diff --git a/epplets/ConfigTestEpplet.c b/epplets/ConfigTestEpplet.c
index 35ce297..2f76c79 100644
--- a/epplets/ConfigTestEpplet.c
+++ b/epplets/ConfigTestEpplet.c
@@ -6,7 +6,6 @@ cb_close(void *data __UNUSED__)
{
Epplet_unremember();
Esync();
- Epplet_cleanup();
exit(0);
}
diff --git a/epplets/E-Areas.c b/epplets/E-Areas.c
index a800b59..732f439 100644
--- a/epplets/E-Areas.c
+++ b/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 <j...@chirp.com.au>",
3, 3, argc, argv, 0);
diff --git a/epplets/E-Bandwidth.c b/epplets/E-Bandwidth.c
index d5b260c..736bee5 100644
--- a/epplets/E-Bandwidth.c
+++ b/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();
diff --git a/epplets/E-Biff.c b/epplets/E-Biff.c
index fdbb44b..9252152 100644
--- a/epplets/E-Biff.c
+++ b/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();
diff --git a/epplets/E-Clock.c b/epplets/E-Clock.c
index 37c2b5c..511291c 100644
--- a/epplets/E-Clock.c
+++ b/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");
diff --git a/epplets/E-Cpu.c b/epplets/E-Cpu.c
index a116050..7c44a5c 100644
--- a/epplets/E-Cpu.c
+++ b/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));
diff --git a/epplets/E-Disk.c b/epplets/E-Disk.c
index 0e91040..9952ebb 100644
--- a/epplets/E-Disk.c
+++ b/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();
diff --git a/epplets/E-Exec.c b/epplets/E-Exec.c
index 2966290..b310c8a 100644
--- a/epplets/E-Exec.c
+++ b/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,
diff --git a/epplets/E-Load.c b/epplets/E-Load.c
index 3773a90..d7e90a6 100644
--- a/epplets/E-Load.c
+++ b/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);
diff --git a/epplets/E-LoadMeter.c b/epplets/E-LoadMeter.c
index 36ad963..6d58436 100644
--- a/epplets/E-LoadMeter.c
+++ b/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);
diff --git a/epplets/E-Magic.c b/epplets/E-Magic.c
index d06453c..b8cfb8d 100644
--- a/epplets/E-Magic.c
+++ b/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);
diff --git a/epplets/E-Mixer.c b/epplets/E-Mixer.c
index 109d8e1..d68d6a0 100644
--- a/epplets/E-Mixer.c
+++ b/epplets/E-Mixer.c
@@ -302,8 +302,6 @@ main(int argc, char **argv)
{
int i;
- atexit(Epplet_cleanup);
-
#ifdef SGI_AUDIO
openMixer("audout");
#else
diff --git a/epplets/E-MoonClock.c b/epplets/E-MoonClock.c
index 061eef1..dfbfe1d 100644
--- a/epplets/E-MoonClock.c
+++ b/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();
diff --git a/epplets/E-Mountbox.c b/epplets/E-Mountbox.c
index 7ce97f6..5fc8aef 100644
--- a/epplets/E-Mountbox.c
+++ b/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();
diff --git a/epplets/E-Net.c b/epplets/E-Net.c
index 64d6a88..5b39ebf 100644
--- a/epplets/E-Net.c
+++ b/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();
diff --git a/epplets/E-NetFlame.c b/epplets/E-NetFlame.c
index 977f6cb..2e4d512 100644
--- a/epplets/E-NetFlame.c
+++ b/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));
diff --git a/epplets/E-NetGraph.c b/epplets/E-NetGraph.c
index 28f20ca..7762eaa 100644
--- a/epplets/E-NetGraph.c
+++ b/epplets/E-NetGraph.c
@@ -408,7 +408,6 @@ main(int argc, char **argv)
Epplet_load_config();
load_config();
- atexit(Epplet_cleanup);
while (i < argc)
{
diff --git a/epplets/E-OpenGL-Demo.c b/epplets/E-OpenGL-Demo.c
index c49676c..8ba8c40 100644
--- a/epplets/E-OpenGL-Demo.c
+++ b/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();
diff --git a/epplets/E-Pants.c b/epplets/E-Pants.c
index 92cbcc4..fc87e5c 100644
--- a/epplets/E-Pants.c
+++ b/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");
diff --git a/epplets/E-Pinger.c b/epplets/E-Pinger.c
index 88acc1f..4de3362 100644
--- a/epplets/E-Pinger.c
+++ b/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");
diff --git a/epplets/E-PlayCD.c b/epplets/E-PlayCD.c
index d0128f0..2bdc11c 100644
--- a/epplets/E-PlayCD.c
+++ b/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();
diff --git a/epplets/E-Power.c b/epplets/E-Power.c
index 0652fa2..fa86808 100644
--- a/epplets/E-Power.c
+++ b/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);
diff --git a/epplets/E-SD.c b/epplets/E-SD.c
index 4b78ad8..88916cd 100644
--- a/epplets/E-SD.c
+++ b/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,
diff --git a/epplets/E-ScreenSave.c b/epplets/E-ScreenSave.c
index 45c8ff6..3f1d961 100644
--- a/epplets/E-ScreenSave.c
+++ b/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();
diff --git a/epplets/E-ScreenShoot.c b/epplets/E-ScreenShoot.c
index b3299e3..4c99844 100644
--- a/epplets/E-ScreenShoot.c
+++ b/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();
diff --git a/epplets/E-Slides.c b/epplets/E-Slides.c
index 680c36b..cc823ea 100644
--- a/epplets/E-Slides.c
+++ b/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++)
diff --git a/epplets/E-Sys.c b/epplets/E-Sys.c
index aaa08b1..6e405d1 100644
--- a/epplets/E-Sys.c
+++ b/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);
diff --git a/epplets/E-Time.c b/epplets/E-Time.c
index ec16046..af814a1 100644
--- a/epplets/E-Time.c
+++ b/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();
diff --git a/epplets/E-Toolbox.c b/epplets/E-Toolbox.c
index ff1e050..00c2653 100644
--- a/epplets/E-Toolbox.c
+++ b/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++)
{
diff --git a/epplets/E-UrlWatch.c b/epplets/E-UrlWatch.c
index 5bd7350..65b2e54 100644
--- a/epplets/E-UrlWatch.c
+++ b/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);
diff --git a/epplets/E-Wireless.c b/epplets/E-Wireless.c
index 34d7d2f..36cd73b 100644
--- a/epplets/E-Wireless.c
+++ b/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);
diff --git a/epplets/E-Xss.c b/epplets/E-Xss.c
index 1d233bc..d4d6290 100644
--- a/epplets/E-Xss.c
+++ b/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();
diff --git a/epplets/Emix.c b/epplets/Emix.c
index 5fc8937..1ad6ffc 100644
--- a/epplets/Emix.c
+++ b/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,
diff --git a/epplets/TestEpplet.c b/epplets/TestEpplet.c
index 62580dc..eb79c35 100644
--- a/epplets/TestEpplet.c
+++ b/epplets/TestEpplet.c
@@ -35,7 +35,6 @@ cb_close(void *data __UNUSED__)
{
Epplet_unremember();
Esync();
- Epplet_cleanup();
exit(0);
}
--
