Introduce Epplet_Exit()

Avoiding some code duplication.

api/epplet.c

@@ -659,6 +659,14 @@ Epplet_internal_create_window(int w, int h, const char *title, char vertical,
    return ret->win;
 }
 
+void
+Epplet_Exit(int rc)
+{
+   Epplet_unremember();
+   Esync();
+   exit(rc);
+}
+
 Window
 Epplet_create_window(int w, int h, const char *title, char vertical)
 {

api/epplet.h.in

@@ -78,11 +78,16 @@ EAPI void           Epplet_Init(const char *name, const char *version,
 				const char *info, int w, int h,
 				int argc, char **argv, char vertical);
 
+/****************************************************************************/
+/* Exit call                                                                */
+/****************************************************************************/
+/* Should normally be called to exit your epplet (calls Epplet_cleanup()) */
+EAPI void           Epplet_Exit(int rc);
+
 /****************************************************************************/
 /* Cleanup call                                                             */
 /****************************************************************************/
 /* You HAVE to call this before exiting your epplet!                        */
-
 EAPI void           Epplet_cleanup(void);
 
 /* Adjust priority */

epplets/ConfigTestEpplet.c

@@ -4,9 +4,7 @@
 static void
 cb_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 int

epplets/E-Areas.c

@@ -23,9 +23,7 @@ static Epplet_gadget b_close;
 static void
 close_cb(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Bandwidth.c

@@ -137,9 +137,7 @@ timer_cb(void *data __UNUSED__)
 static void
 close_cb(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Biff.c

@@ -120,9 +120,7 @@ mailcheck_cb(void *data __UNUSED__)
 static void
 close_cb(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Clock.c

@@ -33,9 +33,7 @@ cb_timer(void *data __UNUSED__)
 static void
 cb_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Cpu.c

@@ -265,9 +265,7 @@ cb_timer(void *data __UNUSED__)
 static void
 cb_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Disk.c

@@ -173,9 +173,7 @@ timer_cb(void *data __UNUSED__)
 static void
 close_cb(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Exec.c

@@ -24,8 +24,7 @@ static void         exec_popup(void *data);
 static void
 cb_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Load.c

@@ -75,9 +75,7 @@ cb_timer(void *data __UNUSED__)
 static void
 cb_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static int

epplets/E-LoadMeter.c

@@ -65,9 +65,7 @@ timer_cb(void *data __UNUSED__)
 static void
 close_cb(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Magic.c

@@ -84,9 +84,7 @@ button_click_cb(void *data __UNUSED__)
 static void
 close_cb(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-MemWatch.c

@@ -193,9 +193,7 @@ timer_cb(void *data __UNUSED__)
 static void
 close_cb(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Mixer.c

@@ -185,14 +185,13 @@ setMixer(int myvol)
 static void
 cb_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
 #ifdef SGI_AUDIO
    alClosePort(audport);
 #else
    close(mixerfd);
 #endif
-   Esync();
-   exit(0);
+
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-MoonClock.c

@@ -65,9 +65,7 @@ moonclock_cb(void *data __UNUSED__)
 static void
 close_cb(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Mountbox.c

@@ -1427,9 +1427,8 @@ CallbackExit(void *data __UNUSED__)
    FreeMounts();
    FreeMountPointTypes();
    FreeImages();
-   Epplet_unremember();
-   Esync();
-   exit(0);
+
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Net.c

@@ -28,9 +28,7 @@ cb_timer(void *data __UNUSED__)
 	Epplet_dialog_ok
 	   ("Unable to get network device statistics for eth0:  %s",
 	    net_strerror(invalid));
-	Epplet_unremember();
-	Esync();
-	exit(-1);
+	Epplet_Exit(1);
      }
    if (val != -1.0)
      {
@@ -92,9 +90,7 @@ cb_set_downstream(void *data)
 static void
 cb_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 int

epplets/E-NetFlame.c

@@ -243,9 +243,7 @@ epplet_timer(void *data __UNUSED__)
      {
 	Epplet_dialog_ok("Unable to get network device statistics for %s:  %s",
 			 netdev, net_strerror(invalid));
-	Epplet_unremember();
-	Esync();
-	exit(-1);
+	Epplet_Exit(1);
      }
    if (val != -1.0)
      {
@@ -269,9 +267,7 @@ epplet_timer(void *data __UNUSED__)
 static void
 epplet_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 /* called when you select a color from the epplet color menu */

epplets/E-NetGraph.c

@@ -194,9 +194,7 @@ timer_draw(void *data __UNUSED__)
 static void
 cb_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void
@@ -422,9 +420,7 @@ main(int argc, char **argv)
 		    {
 		       fprintf(stderr, "missing device "
 			       "string -- aborting\n");
-		       Epplet_unremember();
-		       Esync();
-		       exit(1);
+		       Epplet_Exit(1);
 		    }
 		  i += 2;
 		  break;

epplets/E-OpenGL-Demo.c

@@ -219,11 +219,10 @@ cb_close(void *data)
    GLXContext         *cx;
 
    cx = (GLXContext *) data;
-   Epplet_unremember();
-   Esync();
    if (cx)
       Epplet_unbind_GL(*cx);
-   exit(0);
+
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Pants.c

@@ -104,9 +104,7 @@ log_pants(void *data __UNUSED__)
 static void
 cb_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Pinger.c

@@ -200,9 +200,7 @@ nb_read(int fd, char *buffer, unsigned int n)
 static void
 cb_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-PlayCD.c

@@ -125,9 +125,7 @@ update_track_info(void *data __UNUSED__)
 static void
 cb_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   cd_finish(cd_desc);
-   exit(0);
+   Epplet_Exit(0);
 }
 
 /* Rewind */

epplets/E-Power.c

@@ -403,9 +403,7 @@ cb_timer(void *data __UNUSED__)
 static void
 cb_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-SD.c

@@ -110,10 +110,9 @@ static void
 cb_close(void *data __UNUSED__)
 {
    save_config();
-   Epplet_unremember();
    esd_close(esd.fd);
-   Esync();
-   exit(0);
+
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-ScreenSave.c

@@ -138,9 +138,8 @@ static void
 cb_close(void *data __UNUSED__)
 {
    save_config();
-   Epplet_unremember();
-   Esync();
-   exit(0);
+
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-ScreenShoot.c

@@ -227,9 +227,8 @@ static void
 cb_close(void *data __UNUSED__)
 {
    save_config();
-   Epplet_unremember();
-   Esync();
-   exit(0);
+
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Slides.c

@@ -322,9 +322,7 @@ change_image(void *data __UNUSED__)
 static void
 close_cb(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Sys.c

@@ -95,9 +95,7 @@ timer_cb(void *data __UNUSED__)
 static void
 close_cb(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Time.c

@@ -71,9 +71,7 @@ timer_cb(void *data __UNUSED__)
 static void
 close_cb(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Toolbox.c

@@ -163,9 +163,7 @@ delete_gadget(int n)
 static void
 close_cb(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-UrlWatch.c

@@ -138,11 +138,8 @@ cb_close(void *data __UNUSED__)
 {
    /* save options */
    save_config();
-   /* User closed, so forget session restart */
-   Epplet_unremember();
-   /* Sync drawing and ipc to eesh */
-   Esync();
-   exit(0);
+
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Wireless.c

@@ -186,10 +186,9 @@ cb_out(void *data __UNUSED__, Window w __UNUSED__)
 static void
 cb_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
    free(cpu_hist);
-   exit(0);
+
+   Epplet_Exit(0);
 }
 
 static void

epplets/E-Xss.c

@@ -97,9 +97,8 @@ static void
 close_cb(void *data __UNUSED__)
 {
    stop_hack();
-   Epplet_unremember();
-   Esync();
-   exit(0);
+
+   Epplet_Exit(0);
 }
 
 static void

epplets/Emix.c

@@ -35,10 +35,9 @@ static Epplet_gadget b_mute;
 static void
 cb_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
    close(fd_mixer);
-   Esync();
-   exit(0);
+
+   Epplet_Exit(0);
 }
 
 static void

epplets/TestEpplet.c

@@ -33,9 +33,7 @@ cb_timer(void *data __UNUSED__)
 static void
 cb_close(void *data __UNUSED__)
 {
-   Epplet_unremember();
-   Esync();
-   exit(0);
+   Epplet_Exit(0);
 }
 
 int