Changeset 552b69f in mainline for uspace/app

Timestamp:

2021-11-03T20:56:59Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1aa8c86

Parents:

ec8a1bf

Message:

Dual-mode applications should automatically fall back to console

Location:

uspace/app

Files:

• calculator/calculator.c (modified) (1 diff)
• hello/hello.c (modified) (1 diff)
• launcher/launcher.c (modified) (2 diffs)
• uidemo/uidemo.c (modified) (1 diff)

uspace/app/calculator/calculator.c

@@ -787 +787 @@
 int main(int argc, char *argv[])
 {
-        const char *display_spec = UI_DISPLAY_DEFAULT;
+        const char *display_spec = UI_ANY_DEFAULT;
         ui_t *ui;
         ui_resource_t *ui_res;

uspace/app/hello/hello.c

@@ -152 +152 @@
 int main(int argc, char *argv[])
 {
-        const char *display_spec = UI_DISPLAY_DEFAULT;
+        const char *display_spec = UI_ANY_DEFAULT;
         errno_t rc;
         int i;

uspace/app/launcher/launcher.c

@@ -56 +56 @@
 #define NAME  "launcher"
 
-static char *display_spec = UI_DISPLAY_DEFAULT;
+static const char *display_spec = UI_DISPLAY_DEFAULT;
 
 static void wnd_close(ui_window_t *, void *);
@@ -137 +137 @@
         *argp++ = app;
 
-        if (display_spec != UI_DISPLAY_DEFAULT) {
+        if (str_cmp(display_spec, UI_DISPLAY_DEFAULT) != 0) {
                 *argp++ = "-d";
                 *argp++ = display_spec;

uspace/app/uidemo/uidemo.c

@@ -1019 +1019 @@
 int main(int argc, char *argv[])
 {
-        const char *display_spec = UI_DISPLAY_DEFAULT;
+        const char *display_spec = UI_ANY_DEFAULT;
         errno_t rc;
         int i;