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

Commit 5ff6da8c authored by Riley Andrews's avatar Riley Andrews Committed by Android Git Automerger
Browse files

am dbb93515: Merge "libcutils: Fix warnings in properties.c when verbose logging is enabled" 

* commit 'dbb93515':
  libcutils: Fix warnings in properties.c when verbose logging is enabled
parents 1fe97b3d dbb93515

libcutils/properties.c

+4 −3
Original line number Diff line number Diff line
@@ -78,15 +78,16 @@ static intmax_t property_get_imax(const char *key, intmax_t lower_bound, intmax_ 
        if ((result == INTMAX_MIN || result == INTMAX_MAX) && errno == ERANGE) {

            // Over or underflow

            result = default_value;

            ALOGV("%s(%s,%lld) - overflow", __FUNCTION__, key, default_value);

            ALOGV("%s(%s,%" PRIdMAX ") - overflow", __FUNCTION__, key, default_value);

        } else if (result < lower_bound || result > upper_bound) {

            // Out of range of requested bounds

            result = default_value;

            ALOGV("%s(%s,%lld) - out of range", __FUNCTION__, key, default_value);

            ALOGV("%s(%s,%" PRIdMAX ") - out of range", __FUNCTION__, key, default_value);

        } else if (end == buf) {

            // Numeric conversion failed

            result = default_value;

            ALOGV("%s(%s,%lld) - numeric conversion failed", __FUNCTION__, key, default_value);

            ALOGV("%s(%s,%" PRIdMAX ") - numeric conversion failed",

                    __FUNCTION__, key, default_value);

        }



        errno = tmp;

libcutils/tests/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ test_src_files := \ 
    PropertiesTest.cpp \



shared_libraries := \

    libutils

    libutils \

    liblog



static_libraries := \

    libcutils