Fix reference to FAQ in README

PR #3065 <https://github.com/Genymobile/scrcpy/pull/3065>

Signed-off-by: Romain Vimont <rom@rom1v.com>

README.md

@@ -448,9 +448,6 @@ scrcpy --serial 0123456789abcdef
 scrcpy -s 0123456789abcdef  # short version
 ```
 
-The serial may also be provided via the environment variable `ANDROID_SERIAL`
-(also used by `adb`).
-
 If the device is connected over TCP/IP:
 
 ```bash
@@ -1108,7 +1105,7 @@ See [BUILD].
 
 ## Common issues
 
-See the [FAQ].md).
+See the [FAQ].
 
 [FAQ]: FAQ.md
 

app/scrcpy.1

@@ -355,12 +355,6 @@ Set the initial window height.
 
 Default is 0 (automatic).
 
-.SH EXIT STATUS
-.B scrcpy
-will exit with code 0 on normal program termination. If an initial
-connection cannot be established, the exit code 1 will be returned. If the
-device disconnects while a session is active, exit code 2 will be returned.
-
 .SH SHORTCUTS
 
 In the following list, MOD is the shortcut modifier. By default, it's (left)
@@ -477,10 +471,6 @@ Push file to device (see \fB\-\-push\-target\fR)
 .B ADB
 Path to adb.
 
-.TP
-.B ANDROID_SERIAL
-Device serial to use if no selector (-s, -d, -e or --tcpip=<addr>) is specified.
-
 .TP
 .B SCRCPY_ICON_PATH
 Path to the program icon.

app/src/cli.c

@@ -80,11 +80,6 @@ struct sc_envvar {
     const char *text;
 };
 
-struct sc_exit_status {
-    unsigned value;
-    const char *text;
-};
-
 struct sc_getopt_adapter {
     char *optstring;
     struct option *longopts;
@@ -660,11 +655,6 @@ static const struct sc_envvar envvars[] = {
         .name = "ADB",
         .text = "Path to adb executable",
     },
-    {
-        .name = "ANDROID_SERIAL",
-        .text = "Device serial to use if no selector (-s, -d, -e or "
-                "--tcpip=<addr>) is specified",
-    },
     {
         .name = "SCRCPY_ICON_PATH",
         .text = "Path to the program icon",
@@ -672,22 +662,7 @@ static const struct sc_envvar envvars[] = {
     {
         .name = "SCRCPY_SERVER_PATH",
         .text = "Path to the server binary",
-    },
-};
-
-static const struct sc_exit_status exit_statuses[] = {
-    {
-        .value = 0,
-        .text = "Normal program termination",
-    },
-    {
-        .value = 1,
-        .text = "Start failure",
-    },
-    {
-        .value = 2,
-        .text = "Device disconnected while running",
-    },
+    }
 };
 
 static char *
@@ -926,25 +901,6 @@ print_envvar(const struct sc_envvar *envvar, unsigned cols) {
     free(text);
 }
 
-static void
-print_exit_status(const struct sc_exit_status *status, unsigned cols) {
-    assert(cols > 8); // sc_str_wrap_lines() requires indent < columns
-    assert(status->text);
-
-    // The text starts at 9: 4 ident spaces, 3 chars for numeric value, 2 spaces
-    char *text = sc_str_wrap_lines(status->text, cols, 9);
-    if (!text) {
-        printf("<ERROR>\n");
-        return;
-    }
-
-    assert(strlen(text) >= 9); // Contains at least the initial identation
-
-    // text + 9 to remove the initial indentation
-    printf("    %3d  %s\n", status->value, text + 9);
-    free(text);
-}
-
 void
 scrcpy_print_usage(const char *arg0) {
 #define SC_TERM_COLS_DEFAULT 80
@@ -983,11 +939,6 @@ scrcpy_print_usage(const char *arg0) {
     for (size_t i = 0; i < ARRAY_LEN(envvars); ++i) {
         print_envvar(&envvars[i], cols);
     }
-
-    printf("\nExit status:\n\n");
-    for (size_t i = 0; i < ARRAY_LEN(exit_statuses); ++i) {
-        print_exit_status(&exit_statuses[i], cols);
-    }
 }
 
 static bool

app/src/main.c

@@ -40,19 +40,19 @@ main(int argc, char *argv[]) {
 #endif
 
     if (!scrcpy_parse_args(&args, argc, argv)) {
-        return SCRCPY_EXIT_FAILURE;
+        return 1;
     }
 
     sc_set_log_level(args.opts.log_level);
 
     if (args.help) {
         scrcpy_print_usage(argv[0]);
-        return SCRCPY_EXIT_SUCCESS;
+        return 0;
     }
 
     if (args.version) {
         scrcpy_print_version();
-        return SCRCPY_EXIT_SUCCESS;
+        return 0;
     }
 
 #ifdef SCRCPY_LAVF_REQUIRES_REGISTER_ALL
@@ -66,17 +66,17 @@ main(int argc, char *argv[]) {
 #endif
 
     if (avformat_network_init()) {
-        return SCRCPY_EXIT_FAILURE;
+        return 1;
     }
 
 #ifdef HAVE_USB
-    enum scrcpy_exit_code ret = args.opts.otg ? scrcpy_otg(&args.opts)
-                                              : scrcpy(&args.opts);
+    bool ok = args.opts.otg ? scrcpy_otg(&args.opts)
+                            : scrcpy(&args.opts);
 #else
-    enum scrcpy_exit_code ret = scrcpy(&args.opts);
+    bool ok = scrcpy(&args.opts);
 #endif
 
     avformat_network_deinit(); // ignore failure
 
-    return ret;
+    return ok ? 0 : 1;
 }

app/src/scrcpy.c

@@ -149,41 +149,38 @@ sdl_configure(bool display, bool disable_screensaver) {
     }
 }
 
-static enum scrcpy_exit_code
+static bool
 event_loop(struct scrcpy *s) {
     SDL_Event event;
     while (SDL_WaitEvent(&event)) {
         switch (event.type) {
             case EVENT_STREAM_STOPPED:
                 LOGW("Device disconnected");
-                return SCRCPY_EXIT_DISCONNECTED;
+                return false;
             case SDL_QUIT:
                 LOGD("User requested to quit");
-                return SCRCPY_EXIT_SUCCESS;
+                return true;
             default:
                 sc_screen_handle_event(&s->screen, &event);
                 break;
         }
     }
-    return SCRCPY_EXIT_FAILURE;
+    return false;
 }
 
-// Return true on success, false on error
 static bool
-await_for_server(bool *connected) {
+await_for_server(void) {
     SDL_Event event;
     while (SDL_WaitEvent(&event)) {
         switch (event.type) {
             case SDL_QUIT:
                 LOGD("User requested to quit");
-                *connected = false;
-                return true;
+                return false;
             case EVENT_SERVER_CONNECTION_FAILED:
                 LOGE("Server connection failed");
                 return false;
             case EVENT_SERVER_CONNECTED:
                 LOGD("Server connected");
-                *connected = true;
                 return true;
             default:
                 break;
@@ -265,7 +262,7 @@ sc_server_on_disconnected(struct sc_server *server, void *userdata) {
     // event
 }
 
-enum scrcpy_exit_code
+bool
 scrcpy(struct scrcpy_options *options) {
     static struct scrcpy scrcpy;
     struct scrcpy *s = &scrcpy;
@@ -273,12 +270,12 @@ scrcpy(struct scrcpy_options *options) {
     // Minimal SDL initialization
     if (SDL_Init(SDL_INIT_EVENTS)) {
         LOGE("Could not initialize SDL: %s", SDL_GetError());
-        return SCRCPY_EXIT_FAILURE;
+        return false;
     }
 
     atexit(SDL_Quit);
 
-    enum scrcpy_exit_code ret = SCRCPY_EXIT_FAILURE;
+    bool ret = false;
 
     bool server_started = false;
     bool file_pusher_initialized = false;
@@ -332,7 +329,7 @@ scrcpy(struct scrcpy_options *options) {
         .on_disconnected = sc_server_on_disconnected,
     };
     if (!sc_server_init(&s->server, &params, &cbs, NULL)) {
-        return SCRCPY_EXIT_FAILURE;
+        return false;
     }
 
     if (!sc_server_start(&s->server)) {
@@ -354,14 +351,7 @@ scrcpy(struct scrcpy_options *options) {
     sdl_configure(options->display, options->disable_screensaver);
 
     // Await for server without blocking Ctrl+C handling
-    bool connected;
-    if (!await_for_server(&connected)) {
-        goto end;
-    }
-
-    if (!connected) {
-        // This is not an error, user requested to quit
-        ret = SCRCPY_EXIT_SUCCESS;
+    if (!await_for_server()) {
         goto end;
     }
 

app/src/scrcpy.h

@@ -6,18 +6,7 @@
 #include <stdbool.h>
 #include "options.h"
 
-enum scrcpy_exit_code {
-    // Normal program termination
-    SCRCPY_EXIT_SUCCESS,
-
-    // No connection could be established
-    SCRCPY_EXIT_FAILURE,
-
-    // Device was disconnected while running
-    SCRCPY_EXIT_DISCONNECTED,
-};
-
-enum scrcpy_exit_code
+bool
 scrcpy(struct scrcpy_options *options);
 
 #endif

app/src/server.c

@@ -707,15 +707,7 @@ run_server(void *data) {
         } else if (params->select_tcpip) {
             selector.type = SC_ADB_DEVICE_SELECT_TCPIP;
         } else {
-            // No explicit selection, check $ANDROID_SERIAL
-            const char *env_serial = getenv("ANDROID_SERIAL");
-            if (env_serial) {
-                LOGI("Using ANDROID_SERIAL: %s", env_serial);
-                selector.type = SC_ADB_DEVICE_SELECT_SERIAL;
-                selector.serial = env_serial;
-            } else {
-                selector.type = SC_ADB_DEVICE_SELECT_ALL;
-            }
+            selector.type = SC_ADB_DEVICE_SELECT_ALL;
         }
         struct sc_adb_device device;
         ok = sc_adb_select_device(&server->intr, &selector, 0, &device);

app/src/usb/hid_keyboard.c

@@ -340,7 +340,7 @@ push_mod_lock_state(struct sc_hid_keyboard *kb, uint16_t mods_state) {
 
     if (!sc_aoa_push_hid_event(kb->aoa, &hid_event)) {
         sc_hid_event_destroy(&hid_event);
-        LOGW("Could not request HID event (mod lock state)");
+        LOGW("Could request HID event");
         return false;
     }
 
@@ -382,7 +382,7 @@ sc_key_processor_process_key(struct sc_key_processor *kp,
 
         if (!sc_aoa_push_hid_event(kb->aoa, &hid_event)) {
             sc_hid_event_destroy(&hid_event);
-            LOGW("Could not request HID event (key)");
+            LOGW("Could request HID event");
         }
     }
 }

app/src/usb/hid_mouse.c

@@ -181,7 +181,7 @@ sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
 
     if (!sc_aoa_push_hid_event(mouse->aoa, &hid_event)) {
         sc_hid_event_destroy(&hid_event);
-        LOGW("Could not request HID event (mouse motion)");
+        LOGW("Could request HID event");
     }
 }
 
@@ -203,7 +203,7 @@ sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
 
     if (!sc_aoa_push_hid_event(mouse->aoa, &hid_event)) {
         sc_hid_event_destroy(&hid_event);
-        LOGW("Could not request HID event (mouse click)");
+        LOGW("Could request HID event");
     }
 }
 
@@ -228,7 +228,7 @@ sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
 
     if (!sc_aoa_push_hid_event(mouse->aoa, &hid_event)) {
         sc_hid_event_destroy(&hid_event);
-        LOGW("Could not request HID event (mouse scroll)");
+        LOGW("Could request HID event");
     }
 }
 

app/src/usb/scrcpy_otg.c

@@ -29,26 +29,26 @@ sc_usb_on_disconnected(struct sc_usb *usb, void *userdata) {
     }
 }
 
-static enum scrcpy_exit_code
+static bool
 event_loop(struct scrcpy_otg *s) {
     SDL_Event event;
     while (SDL_WaitEvent(&event)) {
         switch (event.type) {
             case EVENT_USB_DEVICE_DISCONNECTED:
                 LOGW("Device disconnected");
-                return SCRCPY_EXIT_DISCONNECTED;
+                return false;
             case SDL_QUIT:
                 LOGD("User requested to quit");
-                return SCRCPY_EXIT_SUCCESS;
+                return true;
             default:
                 sc_screen_otg_handle_event(&s->screen_otg, &event);
                 break;
         }
     }
-    return SCRCPY_EXIT_FAILURE;
+    return false;
 }
 
-enum scrcpy_exit_code
+bool
 scrcpy_otg(struct scrcpy_options *options) {
     static struct scrcpy_otg scrcpy_otg;
     struct scrcpy_otg *s = &scrcpy_otg;
@@ -67,7 +67,7 @@ scrcpy_otg(struct scrcpy_options *options) {
         LOGW("Could not enable mouse focus clickthrough");
     }
 
-    enum scrcpy_exit_code ret = SCRCPY_EXIT_FAILURE;
+    bool ret = false;
 
     struct sc_hid_keyboard *keyboard = NULL;
     struct sc_hid_mouse *mouse = NULL;
@@ -90,7 +90,7 @@ scrcpy_otg(struct scrcpy_options *options) {
     };
     bool ok = sc_usb_init(&s->usb);
     if (!ok) {
-        return SCRCPY_EXIT_FAILURE;
+        return false;
     }
 
     struct sc_usb_device usb_device;

app/src/usb/scrcpy_otg.h

@@ -3,10 +3,10 @@
 
 #include "common.h"
 
+#include <stdbool.h>
 #include "options.h"
-#include "scrcpy.h"
 
-enum scrcpy_exit_code
+bool
 scrcpy_otg(struct scrcpy_options *options);
 
 #endif

app/src/usb/usb.c

@@ -15,7 +15,6 @@ read_string(libusb_device_handle *handle, uint8_t desc_index) {
                                            (unsigned char *) buffer,
                                            sizeof(buffer));
     if (result < 0) {
-        LOGD("Read string: libusb error: %s", libusb_strerror(result));
         return NULL;
     }