Changeset dc5c303 in mainline for uspace/lib/ui/src/promptdialog.c

Timestamp:

2023-12-28T13:59:23Z (14 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• uspace/lib/ui/src/promptdialog.c (modified) (3 diffs)

uspace/lib/ui/src/promptdialog.c

@@ -327 +327 @@
 {
         ui_prompt_dialog_t *dialog = (ui_prompt_dialog_t *) arg;
-        const char *fname;
+        const char *text;
 
         if (event->type == KEY_PRESS &&
@@ -334 +334 @@
                         /* Confirm */
                         if (dialog->cb != NULL && dialog->cb->bok != NULL) {
-                                fname = ui_entry_get_text(dialog->ename);
-                                dialog->cb->bok(dialog, dialog->arg, fname);
+                                text = ui_entry_get_text(dialog->ename);
+                                dialog->cb->bok(dialog, dialog->arg, text);
                                 return;
                         }
@@ -358 +358 @@
 {
         ui_prompt_dialog_t *dialog = (ui_prompt_dialog_t *) arg;
-        const char *fname;
+        const char *text;
 
         if (dialog->cb != NULL && dialog->cb->bok != NULL) {
-                fname = ui_entry_get_text(dialog->ename);
-                dialog->cb->bok(dialog, dialog->arg, fname);
+                text = ui_entry_get_text(dialog->ename);
+                dialog->cb->bok(dialog, dialog->arg, text);
         }
 }