liblog: specify clang format
Switch coding style to match
SideEffects: None
Test: compile
Bug: 27405083
Change-Id: Id426d5c5e3b18f2ceec22b31bbc9781aabf6bcca
diff --git a/liblog/logger.h b/liblog/logger.h
index d94cd14..86c75f8 100644
--- a/liblog/logger.h
+++ b/liblog/logger.h
@@ -30,25 +30,25 @@
/* Union, sock or fd of zero is not allowed unless static initialized */
union android_log_context {
- void *private;
+ void* private;
atomic_int sock;
atomic_int fd;
- struct listnode *node;
+ struct listnode* node;
atomic_uintptr_t atomic_pointer;
};
struct android_log_transport_write {
struct listnode node;
- const char *name; /* human name to describe the transport */
- unsigned logMask; /* mask cache of available() success */
+ const char* name; /* human name to describe the transport */
+ unsigned logMask; /* mask cache of available() success */
union android_log_context context; /* Initialized by static allocation */
int (*available)(log_id_t logId); /* Does not cause resources to be taken */
int (*open)(); /* can be called multiple times, reusing current resources */
void (*close)(); /* free up resources */
/* write log to transport, returns number of bytes propagated, or -errno */
- int (*write)(log_id_t logId, struct timespec *ts,
- struct iovec *vec, size_t nr);
+ int (*write)(log_id_t logId, struct timespec* ts, struct iovec* vec,
+ size_t nr);
};
struct android_log_logger_list;
@@ -57,45 +57,44 @@
struct android_log_transport_read {
struct listnode node;
- const char *name; /* human name to describe the transport */
+ const char* name; /* human name to describe the transport */
/* Does not cause resources to be taken */
int (*available)(log_id_t logId);
- int (*version)(struct android_log_logger *logger,
- struct android_log_transport_context *transp);
+ int (*version)(struct android_log_logger* logger,
+ struct android_log_transport_context* transp);
/* Release resources taken by the following interfaces */
- void (*close)(struct android_log_logger_list *logger_list,
- struct android_log_transport_context *transp);
+ void (*close)(struct android_log_logger_list* logger_list,
+ struct android_log_transport_context* transp);
/*
* Expect all to instantiate open automagically on any call,
* so we do not have an explicit open call.
*/
- int (*read)(struct android_log_logger_list *logger_list,
- struct android_log_transport_context *transp,
- struct log_msg *log_msg);
+ int (*read)(struct android_log_logger_list* logger_list,
+ struct android_log_transport_context* transp,
+ struct log_msg* log_msg);
/* Must only be called if not ANDROID_LOG_NONBLOCK (blocking) */
- int (*poll)(struct android_log_logger_list *logger_list,
- struct android_log_transport_context *transp);
+ int (*poll)(struct android_log_logger_list* logger_list,
+ struct android_log_transport_context* transp);
- int (*clear)(struct android_log_logger *logger,
- struct android_log_transport_context *transp);
- ssize_t (*setSize)(struct android_log_logger *logger,
- struct android_log_transport_context *transp,
- size_t size);
- ssize_t (*getSize)(struct android_log_logger *logger,
- struct android_log_transport_context *transp);
- ssize_t (*getReadableSize)(struct android_log_logger *logger,
- struct android_log_transport_context *transp);
+ int (*clear)(struct android_log_logger* logger,
+ struct android_log_transport_context* transp);
+ ssize_t (*setSize)(struct android_log_logger* logger,
+ struct android_log_transport_context* transp, size_t size);
+ ssize_t (*getSize)(struct android_log_logger* logger,
+ struct android_log_transport_context* transp);
+ ssize_t (*getReadableSize)(struct android_log_logger* logger,
+ struct android_log_transport_context* transp);
- ssize_t (*getPrune)(struct android_log_logger_list *logger_list,
- struct android_log_transport_context *transp,
- char *buf, size_t len);
- ssize_t (*setPrune)(struct android_log_logger_list *logger_list,
- struct android_log_transport_context *transp,
- char *buf, size_t len);
- ssize_t (*getStats)(struct android_log_logger_list *logger_list,
- struct android_log_transport_context *transp,
- char *buf, size_t len);
+ ssize_t (*getPrune)(struct android_log_logger_list* logger_list,
+ struct android_log_transport_context* transp, char* buf,
+ size_t len);
+ ssize_t (*setPrune)(struct android_log_logger_list* logger_list,
+ struct android_log_transport_context* transp, char* buf,
+ size_t len);
+ ssize_t (*getStats)(struct android_log_logger_list* logger_list,
+ struct android_log_transport_context* transp, char* buf,
+ size_t len);
};
struct android_log_logger_list {
@@ -110,7 +109,7 @@
struct android_log_logger {
struct listnode node;
- struct android_log_logger_list *parent;
+ struct android_log_logger_list* parent;
log_id_t logId;
};
@@ -118,34 +117,32 @@
struct android_log_transport_context {
struct listnode node;
union android_log_context context; /* zero init per-transport context */
- struct android_log_logger_list *parent;
+ struct android_log_logger_list* parent;
- struct android_log_transport_read *transport;
+ struct android_log_transport_read* transport;
unsigned logMask; /* mask of requested log buffers */
int ret; /* return value associated with following data */
struct log_msg logMsg; /* peek at upcoming data, valid if logMsg.len != 0 */
};
/* assumes caller has structures read-locked, single threaded, or fenced */
-#define transport_context_for_each(transp, logger_list) \
- for ((transp) = node_to_item((logger_list)->transport.next, \
- struct android_log_transport_context, \
- node); \
- ((transp) != node_to_item(&(logger_list)->transport, \
- struct android_log_transport_context, \
- node)) && \
- ((transp)->parent == (logger_list)); \
- (transp) = node_to_item((transp)->node.next, \
- struct android_log_transport_context, node))
+#define transport_context_for_each(transp, logger_list) \
+ for ((transp) = node_to_item((logger_list)->transport.next, \
+ struct android_log_transport_context, node); \
+ ((transp) != node_to_item(&(logger_list)->transport, \
+ struct android_log_transport_context, node)) && \
+ ((transp)->parent == (logger_list)); \
+ (transp) = node_to_item((transp)->node.next, \
+ struct android_log_transport_context, node))
#define logger_for_each(logp, logger_list) \
- for ((logp) = node_to_item((logger_list)->logger.next, \
+ for ((logp) = node_to_item((logger_list)->logger.next, \
struct android_log_logger, node); \
- ((logp) != node_to_item(&(logger_list)->logger, \
+ ((logp) != node_to_item(&(logger_list)->logger, \
struct android_log_logger, node)) && \
- ((logp)->parent == (logger_list)); \
- (logp) = node_to_item((logp)->node.next, \
- struct android_log_logger, node))
+ ((logp)->parent == (logger_list)); \
+ (logp) = \
+ node_to_item((logp)->node.next, struct android_log_logger, node))
/*
* Global list of log readers.
@@ -168,28 +165,28 @@
#endif
/* Must be called with logger_list_rdlock() or logger_list_wrlock() held */
-#define logger_list_for_each(logger_list) \
- for ((logger_list) = node_to_item(&__android_log_readers, \
- struct android_log_logger_list, \
- node); \
- (logger_list) != node_to_item(&__android_log_readers, \
- struct android_log_logger_list, \
- node) && \
- (logger_list) != node_to_item((logger_list)->node.next, \
- struct android_log_logger_list, \
- node); \
- (logger_list) = node_to_item((logger_list)->node.next, \
- struct android_log_logger_list, \
- node))
+#define logger_list_for_each(logger_list) \
+ for ((logger_list) = node_to_item(&__android_log_readers, \
+ struct android_log_logger_list, node); \
+ (logger_list) != node_to_item(&__android_log_readers, \
+ struct android_log_logger_list, node) && \
+ (logger_list) != node_to_item((logger_list)->node.next, \
+ struct android_log_logger_list, node); \
+ (logger_list) = node_to_item((logger_list)->node.next, \
+ struct android_log_logger_list, node))
/* OS specific dribs and drabs */
#if defined(_WIN32)
#include <private/android_filesystem_config.h>
typedef uint32_t uid_t;
-static inline uid_t __android_log_uid() { return AID_SYSTEM; }
+static inline uid_t __android_log_uid() {
+ return AID_SYSTEM;
+}
#else
-static inline uid_t __android_log_uid() { return getuid(); }
+static inline uid_t __android_log_uid() {
+ return getuid();
+}
#endif
LIBLOG_HIDDEN void __android_log_lock();