Changes in uspace/lib/clui/tinput.c [68b5dd11:a2bdcf87] in mainline

File:

• uspace/lib/clui/tinput.c (modified) (5 diffs)

uspace/lib/clui/tinput.c

@@ -457 +457 @@
 }
 
-static void tinput_set_str(tinput_t *ti, const char *str)
+static void tinput_set_str(tinput_t *ti, char *str)
 {
         str_to_wstr(ti->buffer, INPUT_MAX_SIZE, str);
@@ -853 +853 @@
 }
 
-/** Read in one line of input with initial text provided.
+/** Read in one line of input.
  *
- * @param ti   Text input
- * @param istr Initial string
- * @param dstr Place to save pointer to new string
+ * @param ti   Text input.
+ * @param dstr Place to save pointer to new string.
  *
  * @return EOK on success
@@ -864 +863 @@
  *
  */
-int tinput_read_i(tinput_t *ti, const char *istr, char **dstr)
+int tinput_read(tinput_t *ti, char **dstr)
 {
         console_flush(ti->console);
@@ -870 +869 @@
                 return EIO;
         
-        tinput_set_str(ti, istr);
-
+        ti->pos = 0;
         ti->sel_start = 0;
+        ti->nc = 0;
+        ti->buffer[0] = '\0';
         ti->done = false;
         ti->exit_clui = false;
@@ -916 +916 @@
 }
 
-/** Read in one line of input.
- *
- * @param ti   Text input
- * @param dstr Place to save pointer to new string.
- *
- * @return EOK on success
- * @return ENOENT if user requested abort
- * @return EIO if communication with console failed
- *
- */
-int tinput_read(tinput_t *ti, char **dstr)
-{
-        return tinput_read_i(ti, "", dstr);
-}
-
 static void tinput_key_ctrl(tinput_t *ti, kbd_event_t *ev)
 {