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

Commit 715a58e2 authored by Tom Cherry's avatar Tom Cherry
Browse files

liblog: cleanup log_read.h header 

There's no need to pull in <fcntl.h> to get O_NONBLOCK, since the
ANDROID_LOG_* macros are better standalone.

Also note that 0x00000003 should be reserved since these corresponded
to previously used values.

Test: build
Change-Id: Icaee6ee0250fe97d8324b3b340f7e196767b2711
parent 1c146547

liblog/include/log/log_read.h

+5 −20
Original line number Diff line number Diff line
@@ -16,22 +16,8 @@ 


#pragma once



#include <sys/types.h>



/* deal with possible sys/cdefs.h conflict with fcntl.h */

#ifdef __unused

#define __unused_defined __unused

#undef __unused

#endif



#include <fcntl.h> /* Pick up O_* macros */



/* restore definitions from above */

#ifdef __unused_defined

#define __unused __attribute__((__unused__))

#endif



#include <stdint.h>

#include <sys/types.h>



#include <log/log_id.h>

#include <log/log_time.h>
@@ -40,6 +26,8 @@ 
extern "C" {

#endif



#define ANDROID_LOG_WRAP_DEFAULT_TIMEOUT 7200 /* 2 hour default */



/*

 * Native log reading interface section. See logcat for sample code.

 *
@@ -137,13 +125,10 @@ ssize_t android_logger_get_prune_list(struct logger_list* logger_list, 
                                      char* buf, size_t len);

int android_logger_set_prune_list(struct logger_list* logger_list, const char* buf, size_t len);



#ifndef O_NONBLOCK

/* The below values are used for the `mode` argument of the below functions. */

/* Note that 0x00000003 were previously used and should be considered reserved. */

#define ANDROID_LOG_NONBLOCK 0x00000800

#else

#define ANDROID_LOG_NONBLOCK O_NONBLOCK

#endif

#define ANDROID_LOG_WRAP 0x40000000 /* Block until buffer about to wrap */

#define ANDROID_LOG_WRAP_DEFAULT_TIMEOUT 7200 /* 2 hour default */

#define ANDROID_LOG_PSTORE 0x80000000



struct logger_list* android_logger_list_alloc(int mode, unsigned int tail,

liblog/include_vndk/log/log.h

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 
#ifndef _LIBS_LOG_LOG_H

#define _LIBS_LOG_LOG_H



/* Historically vendors have depended on this header being included. */

#include <fcntl.h>



#include <android/log.h>

#include <log/log_id.h>

#include <log/log_main.h>