From 8083065bd2c0c6a42856441cec4f367342f2dde6 Mon Sep 17 00:00:00 2001 From: ayin Date: Wed, 12 Dec 2007 11:35:56 +0000 Subject: [PATCH] Change init return type to void, it always returns true. --- src/main.C | 4 +--- src/rxvt.C | 5 ++--- src/rxvt.h | 6 +++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main.C b/src/main.C index d408d71a..f4c8a017 100644 --- 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 d5c8eacc..a3b28dba 100644 --- 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 2a7f2dc0..7896e366 100644 --- 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); -- 2.34.1