commit 04bbc8ea4584b14c21e0c63f8dc4c6b4beb7bd47
author Mark Salyzyn <salyzyn@google.com> Wed Mar 08 15:03:20 2017 -0800
committer Mark Salyzyn <salyzyn@google.com> Thu Mar 09 09:36:34 2017 -0800
tree e906eca16f222fc43c8a0e848bc3fdda0461560b
parent 2ed51d708eda64516ec79ac6397f690de38f0075

liblog: stay away from C++ keyword private

Replace with void* private with priv in context structure.

SideEffects: None
Test: gTest liblog-unit-tests
Bug: 27405083
Change-Id: I670cb0b7fb2f3085ea13b4ac836d84239a3c8572

liblog/stderr_write.c

diff --git a/liblog/stderr_write.c b/liblog/stderr_write.c
index 291ce93..dbe5309 100644
--- a/liblog/stderr_write.c
+++ b/liblog/stderr_write.c
@@ -57,7 +57,7 @@
 
 LIBLOG_HIDDEN struct android_log_transport_write stderrLoggerWrite = {
   .node = { &stderrLoggerWrite.node, &stderrLoggerWrite.node },
-  .context.private = NULL,
+  .context.priv = NULL,
   .name = "stderr",
   .available = stderrAvailable,
   .open = stderrOpen,
@@ -74,7 +74,7 @@
     return -EBADF;
   }
 
-  if (stderrLoggerWrite.context.private) {
+  if (stderrLoggerWrite.context.priv) {
     return fileno(stderr);
   }
 
@@ -117,16 +117,16 @@
   if (envStr) {
     android_log_addFilterString(ctx->logformat, envStr);
   }
-  stderrLoggerWrite.context.private = ctx;
+  stderrLoggerWrite.context.priv = ctx;
 
   return fileno(stderr);
 }
 
 static void stderrClose() {
-  struct stderrContext* ctx = stderrLoggerWrite.context.private;
+  struct stderrContext* ctx = stderrLoggerWrite.context.priv;
 
   if (ctx) {
-    stderrLoggerWrite.context.private = NULL;
+    stderrLoggerWrite.context.priv = NULL;
     if (ctx->logformat) {
       android_log_format_free(ctx->logformat);
       ctx->logformat = NULL;
@@ -154,7 +154,7 @@
   char binaryMsgBuf[1024];
   int err;
   size_t i;
-  struct stderrContext* ctx = stderrLoggerWrite.context.private;
+  struct stderrContext* ctx = stderrLoggerWrite.context.priv;
 
   if (!ctx) return -EBADF;
   if (!vec || !nr) return -EINVAL;