Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d69a1c50 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Always use strerror to report errno."

parents bf684148 cd67f00e

init/builtins.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -475,7 +475,7 @@ int do_mount_all(int nargs, char **args) 
        int wp_ret = TEMP_FAILURE_RETRY(waitpid(pid, &status, 0));

        int wp_ret = TEMP_FAILURE_RETRY(waitpid(pid, &status, 0));

        if (wp_ret < 0) {

        if (wp_ret < 0) {

            /* Unexpected error code. We will continue anyway. */

            /* Unexpected error code. We will continue anyway. */

            NOTICE("waitpid failed rc=%d, errno=%d\n", wp_ret, errno);

            NOTICE("waitpid failed rc=%d: %s\n", wp_ret, strerror(errno));

        }

        }





        if (WIFEXITED(status)) {

        if (WIFEXITED(status)) {

init/devices.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -871,7 +871,7 @@ try_loading_again: 
            booting = is_booting();

            booting = is_booting();

            goto try_loading_again;

            goto try_loading_again;

        }

        }

        INFO("firmware: could not open '%s' %d\n", uevent->firmware, errno);

        INFO("firmware: could not open '%s': %s\n", uevent->firmware, strerror(errno));

        write(loading_fd, "-1", 2);

        write(loading_fd, "-1", 2);

        goto data_close_out;

        goto data_close_out;

    }

    }

init/keychords.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ void keychord_init() 




    ret = write(fd, keychords, keychords_length);

    ret = write(fd, keychords, keychords_length);

    if (ret != keychords_length) {

    if (ret != keychords_length) {

        ERROR("could not configure /dev/keychord %d (%d)\n", ret, errno);

        ERROR("could not configure /dev/keychord %d: %s\n", ret, strerror(errno));

        close(fd);

        close(fd);

        fd = -1;

        fd = -1;

    }

    }

init/property_service.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -161,7 +161,7 @@ static void write_persistent_property(const char *name, const char *value) 
    snprintf(tempPath, sizeof(tempPath), "%s/.temp.XXXXXX", PERSISTENT_PROPERTY_DIR);

    snprintf(tempPath, sizeof(tempPath), "%s/.temp.XXXXXX", PERSISTENT_PROPERTY_DIR);

    fd = mkstemp(tempPath);

    fd = mkstemp(tempPath);

    if (fd < 0) {

    if (fd < 0) {

        ERROR("Unable to write persistent property to temp file %s errno: %d\n", tempPath, errno);

        ERROR("Unable to write persistent property to temp file %s: %s\n", tempPath, strerror(errno));

        return;

        return;

    }

    }

    write(fd, value, strlen(value));

    write(fd, value, strlen(value));
@@ -289,15 +289,15 @@ void handle_property_set_fd() 
        close(s);

        close(s);

        return;

        return;

    } else if (nr < 0) {

    } else if (nr < 0) {

        ERROR("sys_prop: error waiting for uid=%d to send property message. err=%d %s\n", cr.uid, errno, strerror(errno));

        ERROR("sys_prop: error waiting for uid=%d to send property message: %s\n", cr.uid, strerror(errno));

        close(s);

        close(s);

        return;

        return;

    }

    }





    r = TEMP_FAILURE_RETRY(recv(s, &msg, sizeof(msg), MSG_DONTWAIT));

    r = TEMP_FAILURE_RETRY(recv(s, &msg, sizeof(msg), MSG_DONTWAIT));

    if(r != sizeof(prop_msg)) {

    if(r != sizeof(prop_msg)) {

        ERROR("sys_prop: mis-match msg size received: %d expected: %zu errno: %d\n",

        ERROR("sys_prop: mis-match msg size received: %d expected: %zu: %s\n",

              r, sizeof(prop_msg), errno);

              r, sizeof(prop_msg), strerror(errno));

        close(s);

        close(s);

        return;

        return;

    }

    }