liblog: audit declare LIBLOG_ABI_PUBLIC
- replace <sys/cdefs.h> with local "log_cdefs.h" which
fortifies and expands definitions, adding LIBLOG_ABI_PUBLIC,
LIBLOG_HIDDEN, LIBLOG_ABI_PRIVATE and LIBLOG_WEAK.
- clearly tag each interface as LIBLOG_ABI_PUBLIC, LIBLOG_HIDDEN,
LIBLOG_ABI_PRIVATE, LIBLOG_WEAK or static depending on scope
- Add -fvisibility=hidden to ensure nothing else leaks
- some code standard adjustments
Bug: 27566046
Change-Id: Ic14033c4e6d833d973beb035ddc1c6134fb35a3f
diff --git a/liblog/log_read.c b/liblog/log_read.c
index fc63d2c..4b83944 100644
--- a/liblog/log_read.c
+++ b/liblog/log_read.c
@@ -24,7 +24,6 @@
#define NOMINMAX /* for windows to suppress definition of min in stdlib.h */
#include <stdlib.h>
#include <string.h>
-#include <sys/cdefs.h>
#include <unistd.h>
#include <cutils/list.h>
@@ -34,23 +33,16 @@
#include <private/android_filesystem_config.h>
#include <private/android_logger.h>
+#include "log_cdefs.h"
+
/* branchless on many architectures. */
#define min(x,y) ((y) ^ (((x) ^ (y)) & -((x) < (y))))
-#if defined(_WIN32)
-#define WEAK static
-#else
-#define WEAK __attribute__((weak))
-#endif
-#ifndef __unused
-#define __unused __attribute__((unused))
-#endif
-
/* Private copy of ../libcutils/socket_local_client.c prevent library loops */
#if defined(_WIN32)
-int WEAK socket_local_client(const char *name, int namespaceId, int type)
+LIBLOG_WEAK int socket_local_client(const char *name, int namespaceId, int type)
{
errno = ENOSYS;
return -ENOSYS;
@@ -71,8 +63,9 @@
#define LISTEN_BACKLOG 4
/* Documented in header file. */
-int WEAK socket_make_sockaddr_un(const char *name, int namespaceId,
- struct sockaddr_un *p_addr, socklen_t *alen)
+LIBLOG_WEAK int socket_make_sockaddr_un(const char *name, int namespaceId,
+ struct sockaddr_un *p_addr,
+ socklen_t *alen)
{
memset (p_addr, 0, sizeof (*p_addr));
size_t namelen;
@@ -151,8 +144,8 @@
*
* Used by AndroidSocketImpl
*/
-int WEAK socket_local_client_connect(int fd, const char *name, int namespaceId,
- int type __unused)
+LIBLOG_WEAK int socket_local_client_connect(int fd, const char *name,
+ int namespaceId, int type __unused)
{
struct sockaddr_un addr;
socklen_t alen;
@@ -178,7 +171,7 @@
* connect to peer named "name"
* returns fd or -1 on error
*/
-int WEAK socket_local_client(const char *name, int namespaceId, int type)
+LIBLOG_WEAK int socket_local_client(const char *name, int namespaceId, int type)
{
int s;
@@ -212,7 +205,7 @@
[LOG_ID_KERNEL] = "kernel",
};
-const char *android_log_id_to_name(log_id_t log_id)
+LIBLOG_ABI_PUBLIC const char *android_log_id_to_name(log_id_t log_id)
{
if (log_id >= LOG_ID_MAX) {
log_id = LOG_ID_MAIN;
@@ -220,7 +213,7 @@
return LOG_NAME[log_id];
}
-log_id_t android_name_to_log_id(const char *logName)
+LIBLOG_ABI_PUBLIC log_id_t android_name_to_log_id(const char *logName)
{
const char *b;
int ret;
@@ -275,7 +268,7 @@
/* android_logger_alloc unimplemented, no use case */
/* method for getting the associated sublog id */
-log_id_t android_logger_get_id(struct logger *logger)
+LIBLOG_ABI_PUBLIC log_id_t android_logger_get_id(struct logger *logger)
{
return logger->id;
}
@@ -409,7 +402,7 @@
return last_uid = uid;
}
-int android_logger_clear(struct logger *logger)
+LIBLOG_ABI_PUBLIC int android_logger_clear(struct logger *logger)
{
char buf[512];
@@ -425,7 +418,7 @@
}
/* returns the total size of the log's ring buffer */
-long android_logger_get_log_size(struct logger *logger)
+LIBLOG_ABI_PUBLIC long android_logger_get_log_size(struct logger *logger)
{
char buf[512];
@@ -441,7 +434,8 @@
return atol(buf);
}
-int android_logger_set_log_size(struct logger *logger, unsigned long size)
+LIBLOG_ABI_PUBLIC int android_logger_set_log_size(struct logger *logger,
+ unsigned long size)
{
char buf[512];
@@ -455,7 +449,8 @@
* returns the readable size of the log's ring buffer (that is, amount of the
* log consumed)
*/
-long android_logger_get_log_readable_size(struct logger *logger)
+LIBLOG_ABI_PUBLIC long android_logger_get_log_readable_size(
+ struct logger *logger)
{
char buf[512];
@@ -474,16 +469,18 @@
/*
* returns the logger version
*/
-int android_logger_get_log_version(struct logger *logger __unused)
+LIBLOG_ABI_PUBLIC int android_logger_get_log_version(
+ struct logger *logger __unused)
{
- return 3;
+ return 4;
}
/*
* returns statistics
*/
-ssize_t android_logger_get_statistics(struct logger_list *logger_list,
- char *buf, size_t len)
+LIBLOG_ABI_PUBLIC ssize_t android_logger_get_statistics(
+ struct logger_list *logger_list,
+ char *buf, size_t len)
{
struct logger *logger;
char *cp = buf;
@@ -509,14 +506,16 @@
return send_log_msg(NULL, NULL, buf, len);
}
-ssize_t android_logger_get_prune_list(struct logger_list *logger_list __unused,
- char *buf, size_t len)
+LIBLOG_ABI_PUBLIC ssize_t android_logger_get_prune_list(
+ struct logger_list *logger_list __unused,
+ char *buf, size_t len)
{
return send_log_msg(NULL, "getPruneList", buf, len);
}
-int android_logger_set_prune_list(struct logger_list *logger_list __unused,
- char *buf, size_t len)
+LIBLOG_ABI_PUBLIC int android_logger_set_prune_list(
+ struct logger_list *logger_list __unused,
+ char *buf, size_t len)
{
const char cmd[] = "setPruneList ";
const size_t cmdlen = sizeof(cmd) - 1;
@@ -531,9 +530,10 @@
return check_log_success(buf, send_log_msg(NULL, NULL, buf, len));
}
-struct logger_list *android_logger_list_alloc(int mode,
- unsigned int tail,
- pid_t pid)
+LIBLOG_ABI_PUBLIC struct logger_list *android_logger_list_alloc(
+ int mode,
+ unsigned int tail,
+ pid_t pid)
{
struct logger_list *logger_list;
@@ -553,9 +553,10 @@
return logger_list;
}
-struct logger_list *android_logger_list_alloc_time(int mode,
- log_time start,
- pid_t pid)
+LIBLOG_ABI_PUBLIC struct logger_list *android_logger_list_alloc_time(
+ int mode,
+ log_time start,
+ pid_t pid)
{
struct logger_list *logger_list;
@@ -578,8 +579,9 @@
/* android_logger_list_unregister unimplemented, no use case */
/* Open the named log and add it to the logger list */
-struct logger *android_logger_open(struct logger_list *logger_list,
- log_id_t id)
+LIBLOG_ABI_PUBLIC struct logger *android_logger_open(
+ struct logger_list *logger_list,
+ log_id_t id)
{
struct logger *logger;
@@ -610,10 +612,11 @@
}
/* Open the single named log and make it part of a new logger list */
-struct logger_list *android_logger_list_open(log_id_t id,
- int mode,
- unsigned int tail,
- pid_t pid)
+LIBLOG_ABI_PUBLIC struct logger_list *android_logger_list_open(
+ log_id_t id,
+ int mode,
+ unsigned int tail,
+ pid_t pid)
{
struct logger_list *logger_list = android_logger_list_alloc(mode, tail, pid);
if (!logger_list) {
@@ -751,8 +754,9 @@
}
/* Read from the selected logs */
-int android_logger_list_read(struct logger_list *logger_list,
- struct log_msg *log_msg)
+LIBLOG_ABI_PUBLIC int android_logger_list_read(
+ struct logger_list *logger_list,
+ struct log_msg *log_msg)
{
int ret, e;
struct logger *logger;
@@ -892,7 +896,8 @@
}
/* Close all the logs */
-void android_logger_list_free(struct logger_list *logger_list)
+LIBLOG_ABI_PUBLIC void android_logger_list_free(
+ struct logger_list *logger_list)
{
if (logger_list == NULL) {
return;