liblog: logd: logcat: Split out log/logger.h into public and private.
log/logger.h pieces moved into log/log.h. Correct for some
minor Android Coding standards.
Test: gTests liblog-unit-tests, logd-unit-tests and logcat-unit-tests
Bug: 19235719
Bug: 26552300
Bug: 31289077
Bug: 31456426
Change-Id: I0a19fd8788eec20a582e72e4c62c04534bdb1b9a
diff --git a/include/log/logprint.h b/include/log/logprint.h
index e5cd1de..493f9f8 100644
--- a/include/log/logprint.h
+++ b/include/log/logprint.h
@@ -21,7 +21,6 @@
#include <android/log.h>
#include <log/event_tag_map.h>
-#include <log/logger.h> /* struct logger_entry */
#ifdef __cplusplus
extern "C" {
@@ -58,24 +57,24 @@
int32_t uid;
int32_t pid;
int32_t tid;
- const char * tag;
+ const char* tag;
size_t tagLen;
size_t messageLen;
- const char * message;
+ const char* message;
} AndroidLogEntry;
-AndroidLogFormat *android_log_format_new();
+AndroidLogFormat* android_log_format_new();
-void android_log_format_free(AndroidLogFormat *p_format);
+void android_log_format_free(AndroidLogFormat* p_format);
/* currently returns 0 if format is a modifier, 1 if not */
-int android_log_setPrintFormat(AndroidLogFormat *p_format,
+int android_log_setPrintFormat(AndroidLogFormat* p_format,
AndroidLogPrintFormat format);
/**
* Returns FORMAT_OFF on invalid string
*/
-AndroidLogPrintFormat android_log_formatFromString(const char *s);
+AndroidLogPrintFormat android_log_formatFromString(const char* s);
/**
* filterExpression: a single filter expression
@@ -87,9 +86,8 @@
*
*/
-int android_log_addFilterRule(AndroidLogFormat *p_format,
- const char *filterExpression);
-
+int android_log_addFilterRule(AndroidLogFormat* p_format,
+ const char* filterExpression);
/**
* filterString: a whitespace-separated set of filter expressions
@@ -101,17 +99,15 @@
*
*/
-int android_log_addFilterString(AndroidLogFormat *p_format,
- const char *filterString);
-
+int android_log_addFilterString(AndroidLogFormat* p_format,
+ const char* filterString);
/**
* returns 1 if this log line should be printed based on its priority
* and tag, and 0 if it should not
*/
int android_log_shouldPrintLine (
- AndroidLogFormat *p_format, const char *tag, android_LogPriority pri);
-
+ AndroidLogFormat* p_format, const char* tag, android_LogPriority pri);
/**
* Splits a wire-format buffer into an AndroidLogEntry
@@ -120,8 +116,8 @@
* Returns 0 on success and -1 on invalid wire format (entry will be
* in unspecified state)
*/
-int android_log_processLogBuffer(struct logger_entry *buf,
- AndroidLogEntry *entry);
+int android_log_processLogBuffer(struct logger_entry* buf,
+ AndroidLogEntry* entry);
/**
* Like android_log_processLogBuffer, but for binary logs.
@@ -129,11 +125,10 @@
* If "map" is non-NULL, it will be used to convert the log tag number
* into a string.
*/
-int android_log_processBinaryLogBuffer(struct logger_entry *buf,
- AndroidLogEntry *entry, const EventTagMap* map, char* messageBuf,
+int android_log_processBinaryLogBuffer(struct logger_entry* buf,
+ AndroidLogEntry* entry, const EventTagMap* map, char* messageBuf,
int messageBufLen);
-
/**
* Formats a log message into a buffer
*
@@ -142,13 +137,12 @@
* Returns NULL on malloc error
*/
-char *android_log_formatLogLine (
- AndroidLogFormat *p_format,
- char *defaultBuffer,
+char* android_log_formatLogLine (
+ AndroidLogFormat* p_format,
+ char* defaultBuffer,
size_t defaultBufferSize,
- const AndroidLogEntry *p_line,
- size_t *p_outLength);
-
+ const AndroidLogEntry* p_line,
+ size_t* p_outLength);
/**
* Either print or do not print log line, based on filter
@@ -157,14 +151,12 @@
*
*/
int android_log_printLogLine(
- AndroidLogFormat *p_format,
+ AndroidLogFormat* p_format,
int fd,
- const AndroidLogEntry *entry);
-
+ const AndroidLogEntry* entry);
#ifdef __cplusplus
}
#endif
-
#endif /*_LOGPRINT_H*/