gui: Don't compute string length unnecessarily.

[paraslash.git] / gui.c

diff --git a/gui.c b/gui.c
index 65b2ac05d748ab1bb7d24e3b752d906d2ffca5c5..696ea1b233a5063488abb5bf0fafc6fae85ae9b4 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -403,7 +403,7 @@ static int draw_top_rbe(unsigned *lines)
        rbe = ringbuffer_get(bot_win_rb, fvr);
        if (!rbe)
                return -1;
-       len = strlen(rbe->msg);
+       len = rbe->len;
        if (*lines > bot.lines) {
                /* first rbe is only partially visible */
                offset = (*lines - bot.lines) * bot.cols;
@@ -1162,7 +1162,7 @@ static void com_scroll_top(void)
                struct rb_entry *rbe = ringbuffer_get(bot_win_rb, i);
                if (!rbe)
                        break;
-               lines += NUM_LINES(strlen(rbe->msg));
+               lines += NUM_LINES(rbe->len);
        }
        i++;
        if (lines > 0 && scroll_position != i) {
@@ -1193,7 +1193,7 @@ static void com_page_down(void)
                struct rb_entry *rbe = ringbuffer_get(bot_win_rb, i);
                if (!rbe)
                        break;
-               lines += NUM_LINES(strlen(rbe->msg));
+               lines += NUM_LINES(rbe->len);
        }
        if (lines) {
                scroll_position = i;
@@ -1486,8 +1486,7 @@ int main(int argc, char *argv[])
        _argc = argc;
        _argv = argv;
 
-       if (gui_cmdline_parser(argc, argv, &conf) != 0)
-               exit(EXIT_FAILURE);
+       gui_cmdline_parser(argc, argv, &conf); /* exits on errors */
        HANDLE_VERSION_FLAG("gui", conf);
        cf = configfile_exists();
        if (!cf && conf.config_file_given) {