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

diff --git a/src/init.C b/src/init.C
index 39e2bd4cc966bac968693ba77ebf8b6db505cc0e..ac21875570ed8298c97c729b903333de485a70e9 100644 (file)
--- a/src/init.C
+++ b/src/init.C
@@ -282,7 +282,7 @@ const char *const def_colorName[] =
 #endif
   };
 
-bool
+void
 rxvt_term::init_vars ()
 {
   pix_colors           = //
@@ -318,8 +318,6 @@ rxvt_term::init_vars ()
   set_option (Opt_pastableTabs);
   set_option (Opt_intensityStyles);
   set_option (Opt_iso14755_52);
-
-  return true;
 }
 
 void

diff --git a/src/main.C b/src/main.C
index e7144626de86e4ca2bdfd3b905ead183f359b40a..d408d71a65a397250dec66eab4560ece0bf88517 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -484,8 +484,7 @@ rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
   set_locale ("");
   set_environ (envv); // few things in X do not call setlocale :(
 
-  if (!init_vars ())
-    return false;
+  init_vars ();
 
   init_secondary ();
 

diff --git a/src/rxvt.h b/src/rxvt.h
index c9d04bf31f7e2f5cbae92dd689394cd27be37a8d..2a7f2dc0fb6462e32a840e0b737a2c5b97d1b296 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1173,7 +1173,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
   void process_sgr_mode (unsigned int nargs, const int *arg);
   void process_graphics ();
   // init.C
-  bool init_vars ();
+  void init_vars ();
   void init_secondary ();
   const char **init_resources (int argc, const char *const *argv);
   void init_env ();