summaryrefslogtreecommitdiffstats
path: root/liblog
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2014-01-28 11:26:56 -0800
committerKristian Monsen <kristianm@google.com>2014-01-28 11:28:32 -0800
commitb5a9890f900a5e2b53e91e6d63f3ade23240f90d (patch)
tree080b5581e8ca5343b0bd0a3f7dac575cc5f941fd /liblog
parent6ddabb7a1cc3080ae773acb045f69b5e6afee87a (diff)
downloadsystem_core-b5a9890f900a5e2b53e91e6d63f3ade23240f90d.zip
system_core-b5a9890f900a5e2b53e91e6d63f3ade23240f90d.tar.gz
system_core-b5a9890f900a5e2b53e91e6d63f3ade23240f90d.tar.bz2
Fixes some warnings
- Implicit decleared function - Unused variable Change-Id: Ia701e66682cb6788f0716a2ef7556ed07227f78f
Diffstat (limited to 'liblog')
-rw-r--r--liblog/fake_log_device.c2
-rw-r--r--liblog/fake_log_device.h28
-rw-r--r--liblog/logd_write.c6
3 files changed, 35 insertions, 1 deletions
diff --git a/liblog/fake_log_device.c b/liblog/fake_log_device.c
index 5283619..be34f01 100644
--- a/liblog/fake_log_device.c
+++ b/liblog/fake_log_device.c
@@ -19,6 +19,8 @@
* passed on to the underlying (fake) log device. When not in the
* simulator, messages are printed to stderr.
*/
+#include "fake_log_device.h"
+
#include <log/logd.h>
#include <stdlib.h>
diff --git a/liblog/fake_log_device.h b/liblog/fake_log_device.h
new file mode 100644
index 0000000..9d168cd
--- /dev/null
+++ b/liblog/fake_log_device.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _LIBLOG_FAKE_LOG_DEVICE_H
+#define _LIBLOG_FAKE_LOG_DEVICE_H
+
+#include <sys/types.h>
+
+struct iovec;
+
+int fakeLogOpen(const char *pathName, int flags);
+int fakeLogClose(int fd);
+ssize_t fakeLogWritev(int fd, const struct iovec* vector, int count);
+
+#endif // _LIBLOG_FAKE_LOG_DEVICE_H
diff --git a/liblog/logd_write.c b/liblog/logd_write.c
index fff7cc4..19d7166 100644
--- a/liblog/logd_write.c
+++ b/liblog/logd_write.c
@@ -35,6 +35,7 @@
#if FAKE_LOG_DEVICE
// This will be defined when building for the host.
+#include "fake_log_device.h"
#define log_open(pathname, flags) fakeLogOpen(pathname, flags)
#define log_writev(filedes, vector, count) fakeLogWritev(filedes, vector, count)
#define log_close(filedes) fakeLogClose(filedes)
@@ -50,6 +51,8 @@ static int (*write_to_log)(log_id_t, struct iovec *vec, size_t nr) = __write_to_
static pthread_mutex_t log_init_lock = PTHREAD_MUTEX_INITIALIZER;
#endif
+#define UNUSED __attribute__((__unused__))
+
static int log_fds[(int)LOG_ID_MAX] = { -1, -1, -1, -1 };
/*
@@ -72,7 +75,8 @@ int __android_log_dev_available(void)
return (g_log_status == kLogAvailable);
}
-static int __write_to_log_null(log_id_t log_fd, struct iovec *vec, size_t nr)
+static int __write_to_log_null(UNUSED log_id_t log_fd, UNUSED struct iovec *vec,
+ UNUSED size_t nr)
{
return -1;
}