wreadln: moved code to insert_byte()

Remove some clutter from wreadln(), isolate some code into a function.

diff --git a/src/wreadln.c b/src/wreadln.c
index d68185a7e42ffabae1702dc74d1a8edbe465e768..f10b8c23f96c125f890b7ddc187ae4415c869ac2 100644 (file)
--- a/src/wreadln.c
+++ b/src/wreadln.c
@@ -117,6 +117,29 @@ static inline void drawline(const struct wreadln *wr)
        doupdate();
 }
 
+static void
+wreadln_insert_byte(struct wreadln *wr, gint key)
+{
+       if (strlen(wr->line + wr->cursor)) { /* if the cursor is */
+               /* not at the last pos */
+               gchar *tmp = NULL;
+               gsize rest = strlen(wr->line + wr->cursor) + 1;
+
+               tmp = g_malloc0(rest);
+               g_strlcpy (tmp, wr->line + wr->cursor, rest);
+               wr->line[wr->cursor] = key;
+               wr->line[wr->cursor + 1] = 0;
+               g_strlcat(&wr->line[wr->cursor + 1], tmp, rest);
+               g_free(tmp);
+               cursor_move_right(wr);
+       } else {
+               wr->line[wr->cursor + 1] = 0;
+               wr->line[wr->cursor] = key;
+       }
+
+       cursor_move_right(wr);
+}
+
 /* libcurses version */
 
 static gchar *
@@ -308,25 +331,8 @@ _wreadln(WINDOW *w,
                        /* ignore char */
                        break;
                default:
-                       if (key >= 32) {
-                               if (strlen(wr.line + wr.cursor)) { /* if the cursor is */
-                                       /* not at the last pos */
-                                       gchar *tmp = NULL;
-                                       gsize size = strlen(wr.line + wr.cursor) + 1;
-
-                                       tmp = g_malloc0(size);
-                                       g_strlcpy (tmp, wr.line + wr.cursor, size);
-                                       wr.line[wr.cursor] = key;
-                                       wr.line[wr.cursor + 1] = 0;
-                                       g_strlcat(&wr.line[wr.cursor + 1], tmp, size);
-                                       g_free(tmp);
-                                       cursor_move_right(&wr);
-                               } else {
-                                       wr.line[wr.cursor + 1] = 0;
-                                       wr.line[wr.cursor] = key;
-                                       cursor_move_right(&wr);
-                               }
-                       }
+                       if (key >= 32)
+                               wreadln_insert_byte(&wr, key);
                }
 
                drawline(&wr);