Change init return type to void, it always returns true.

diff --git a/src/main.C b/src/main.C
index d408d71a65a397250dec66eab4560ece0bf88517..f4c8a01774733e41efcfc777d1b50898c097e3cf 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -475,7 +475,7 @@ rxvt_xioerror_handler (Display *display)
 }
 
 /*----------------------------------------------------------------------*/
-bool
+void
 rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
 {
   this->envv = envv;
@@ -588,8 +588,6 @@ rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
 
   XMapWindow (dpy, vt);
   XMapWindow (dpy, parent[0]);
-
-  return true;
 }
 
 static struct sig_handlers

diff --git a/src/rxvt.C b/src/rxvt.C
index d5c8eaccc43db4167e48ad2baba73aa81a9bb384..a3b28dbadeffd4eea2d803045941a0cdbb586875 100644 (file)
--- a/src/rxvt.C
+++ b/src/rxvt.C
@@ -46,11 +46,10 @@ try
 
     envv->push_back (0);
 
-    if (!t->init (args, envv))
+    t->init (args, envv);
 #else
-    if (!t->init (argc, argv, 0))
+    t->init (argc, argv, 0);
 #endif
-      return EXIT_FAILURE;
 
     ev_loop (0);
 

diff --git a/src/rxvt.h b/src/rxvt.h
index 2a7f2dc0fb6462e32a840e0b737a2c5b97d1b296..7896e3667a91e14f70f115e44a4c9c24aa7bbe64 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1104,10 +1104,10 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
   void tt_write (const char *data, unsigned int len);
   void pty_write ();
 
-  bool init (stringvec *argv, stringvec *envv)
+  void init (stringvec *argv, stringvec *envv)
   {
     this->argv = argv;
-    return init (argv->size (), argv->begin (), envv);
+    init (argv->size (), argv->begin (), envv);
   }
 
   void make_current () const // make this the "currently active" urxvt instance
@@ -1192,7 +1192,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
   ~rxvt_term ();
   void destroy ();
   void emergency_cleanup ();
-  bool init (int argc, const char *const *argv, stringvec *envv);
+  void init (int argc, const char *const *argv, stringvec *envv);
   void recolour_cursor ();
   void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
   void window_calc (unsigned int newwidth, unsigned int newheight);