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

Commit c4c8ecfb authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am:... 

Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9 am: ba11b8e4" into nyc-dev-plus-aosp
am: e60c649a

* commit 'e60c649a':
  Fix misc-macro-parentheses warnings in common_time.

Change-Id: Iaed05df438fd181694c71b842ecaed5b054352b6
parents 0fbfc4b6 e60c649a

libs/common_time/common_time_server_api.cpp

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ void CommonTimeServer::reevaluateAutoDisableState(bool commonClockHasClients) { 
    if (res > 0)                                  \

        write(fd, buffer, res);                   \

} while (0)

#define checked_percentage(a, b) ((0 == b) ? 0.0f : ((100.0f * a) / b))

#define checked_percentage(a, b) ((0 == (b)) ? 0.0f : ((100.0f * (a)) / (b)))



status_t CommonTimeServer::dumpClockInterface(int fd,

                                              const Vector<String16>& /* args */,

libs/common_time/common_time_server_packets.cpp

+6 −6
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ const uint16_t TimeServicePacketHeader::kCurVersion = 1; 
    do {                                                     \

        if ((offset + sizeof(field_name)) > length)          \

            return -1;                                       \

        field_name = converter(*((type*)(data + offset)));  \

        (field_name) = converter(*((type*)(data + offset))); \

        offset += sizeof(field_name);                        \

    } while (0)

#define DESERIALIZE_INT16(field_name) DESERIALIZE_FIELD(field_name, int16_t, ntohs)