Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c6b9b0d authored by Kristian Monsen's avatar Kristian Monsen Committed by Gerrit Code Review
Browse files

Merge "Fixes some warnings"

parents 6ddabb7a b5a9890f
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -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>
+28 −0
Original line number Diff line number Diff line
/*
 * 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
+5 −1
Original line number Diff line number Diff line
@@ -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;
}