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

Commit 2ed51d70 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

liblog: specify clang format 

Switch coding style to match

SideEffects: None
Test: compile
Bug: 27405083
Change-Id: Id426d5c5e3b18f2ceec22b31bbc9781aabf6bcca
parent c1b3c8ef

liblog/.clang-format

0 → 100644
+9 −0
Original line number Diff line number Diff line 
BasedOnStyle: Google

AllowShortFunctionsOnASingleLine: false



CommentPragmas: NOLINT:.*

DerivePointerAlignment: false

PointerAlignment: Left

PenaltyExcessCharacter: 32



Cpp11BracedListStyle: false

liblog/config_read.c

+46 −48
Original line number Diff line number Diff line
@@ -19,10 +19,12 @@ 
#include "config_read.h"

#include "logger.h"



LIBLOG_HIDDEN struct listnode __android_log_transport_read =

    { &__android_log_transport_read, &__android_log_transport_read };

LIBLOG_HIDDEN struct listnode __android_log_persist_read =

    { &__android_log_persist_read, &__android_log_persist_read };

LIBLOG_HIDDEN struct listnode __android_log_transport_read = {

  &__android_log_transport_read, &__android_log_transport_read

};

LIBLOG_HIDDEN struct listnode __android_log_persist_read = {

  &__android_log_persist_read, &__android_log_persist_read

};



static void __android_log_add_transport(

    struct listnode* list, struct android_log_transport_read* transport) {
@@ -43,8 +45,7 @@ static void __android_log_add_transport( 
          return;

        }

        if (((*transp->available)(i) < 0) &&

                        (!transport->available ||

                            ((*transport->available)(i) >= 0))) {

            (!transport->available || ((*transport->available)(i) >= 0))) {

          list_add_tail(list, &transport->node);

          return;

        }
@@ -57,8 +58,7 @@ LIBLOG_HIDDEN void __android_log_config_read() { 
  if (__android_log_frontend & LOGGER_LOCAL) {

    extern struct android_log_transport_read localLoggerRead;



        __android_log_add_transport(&__android_log_transport_read,

                                    &localLoggerRead);

    __android_log_add_transport(&__android_log_transport_read, &localLoggerRead);

  }



#if (FAKE_LOG_DEVICE == 0)
@@ -67,10 +67,8 @@ LIBLOG_HIDDEN void __android_log_config_read() { 
    extern struct android_log_transport_read logdLoggerRead;

    extern struct android_log_transport_read pmsgLoggerRead;



        __android_log_add_transport(&__android_log_transport_read,

                                    &logdLoggerRead);

        __android_log_add_transport(&__android_log_persist_read,

                                    &pmsgLoggerRead);

    __android_log_add_transport(&__android_log_transport_read, &logdLoggerRead);

    __android_log_add_transport(&__android_log_persist_read, &pmsgLoggerRead);

  }

#endif

}

liblog/config_read.h

+20 −24
Original line number Diff line number Diff line
@@ -30,11 +30,9 @@ extern LIBLOG_HIDDEN struct listnode __android_log_persist_read; 
  for ((transp) = node_to_item((transports)->next,                            \

                               struct android_log_transport_read, node);      \

       ((transp) != node_to_item((transports),                                \

                                   struct android_log_transport_read,       \

                                   node)) &&                                \

                                 struct android_log_transport_read, node)) && \

       ((transp) != node_to_item((transp)->node.next,                         \

                                   struct android_log_transport_read,       \

                                   node));                                  \

                                 struct android_log_transport_read, node));   \

       (transp) = node_to_item((transp)->node.next,                           \

                               struct android_log_transport_read, node))
@@ -43,12 +41,10 @@ extern LIBLOG_HIDDEN struct listnode __android_log_persist_read; 
                               struct android_log_transport_read, node),      \

      (n) = (transp)->node.next;                                              \

       ((transp) != node_to_item((transports),                                \

                                   struct android_log_transport_read,       \

                                   node)) &&                                \

         ((transp) != node_to_item((n), struct android_log_transport_read,  \

                                   node));                                  \

         (transp) = node_to_item((n), struct android_log_transport_read,    \

                                 node),                                     \

                                 struct android_log_transport_read, node)) && \

       ((transp) !=                                                           \

        node_to_item((n), struct android_log_transport_read, node));          \

       (transp) = node_to_item((n), struct android_log_transport_read, node), \

      (n) = (transp)->node.next)



LIBLOG_HIDDEN void __android_log_config_read();

liblog/config_write.c

+72 −72
Original line number Diff line number Diff line
@@ -19,10 +19,12 @@ 
#include "config_write.h"

#include "logger.h"



LIBLOG_HIDDEN struct listnode __android_log_transport_write =

    { &__android_log_transport_write, &__android_log_transport_write };

LIBLOG_HIDDEN struct listnode __android_log_persist_write =

    { &__android_log_persist_write, &__android_log_persist_write};

LIBLOG_HIDDEN struct listnode __android_log_transport_write = {

  &__android_log_transport_write, &__android_log_transport_write

};

LIBLOG_HIDDEN struct listnode __android_log_persist_write = {

  &__android_log_persist_write, &__android_log_persist_write

};



static void __android_log_add_transport(

    struct listnode* list, struct android_log_transport_write* transport) {
@@ -43,8 +45,7 @@ static void __android_log_add_transport( 
          return;

        }

        if (((*transp->available)(i) < 0) &&

                        (!transport->available ||

                            ((*transport->available)(i) >= 0))) {

            (!transport->available || ((*transport->available)(i) >= 0))) {

          list_add_tail(list, &transport->node);

          return;

        }
@@ -69,8 +70,7 @@ LIBLOG_HIDDEN void __android_log_config_write() { 


    __android_log_add_transport(&__android_log_transport_write,

                                &logdLoggerWrite);

        __android_log_add_transport(&__android_log_persist_write,

                                    &pmsgLoggerWrite);

    __android_log_add_transport(&__android_log_persist_write, &pmsgLoggerWrite);

#else

    extern struct android_log_transport_write fakeLoggerWrite;

liblog/config_write.h

+20 −24
Original line number Diff line number Diff line
@@ -30,11 +30,9 @@ extern LIBLOG_HIDDEN struct listnode __android_log_persist_write; 
  for ((transp) = node_to_item((transports)->next,                             \

                               struct android_log_transport_write, node);      \

       ((transp) != node_to_item((transports),                                 \

                                   struct android_log_transport_write,       \

                                   node)) &&                                 \

                                 struct android_log_transport_write, node)) && \

       ((transp) != node_to_item((transp)->node.next,                          \

                                   struct android_log_transport_write,       \

                                   node));                                   \

                                 struct android_log_transport_write, node));   \

       (transp) = node_to_item((transp)->node.next,                            \

                               struct android_log_transport_write, node))
@@ -43,12 +41,10 @@ extern LIBLOG_HIDDEN struct listnode __android_log_persist_write; 
                               struct android_log_transport_write, node),      \

      (n) = (transp)->node.next;                                               \

       ((transp) != node_to_item((transports),                                 \

                                   struct android_log_transport_write,       \

                                   node)) &&                                 \

         ((transp) != node_to_item((n), struct android_log_transport_write,  \

                                   node));                                   \

         (transp) = node_to_item((n), struct android_log_transport_write,    \

                                 node),                                      \

                                 struct android_log_transport_write, node)) && \

       ((transp) !=                                                            \

        node_to_item((n), struct android_log_transport_write, node));          \

       (transp) = node_to_item((n), struct android_log_transport_write, node), \

      (n) = (transp)->node.next)



LIBLOG_HIDDEN void __android_log_config_write();