9838b7032e
This is strictly the application of the script 'x-indent-all.sh' from util/modular. Compared to the patch that Daniel posted in January, I've added a few indent flags: -bap -psl -T PrivatePtr -T pmWait -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT The typedefs were needed to make the output of sdksyms.sh match the previous output, otherwise, the code is formatted badly enough that sdksyms.sh generates incorrect output. The generated code was compared with the previous version and found to be essentially identical -- "assert" line numbers and BUILD_TIME were the only differences found. The comparison was done with this script: dir1=$1 dir2=$2 for dir in $dir1 $dir2; do (cd $dir && find . -name '*.o' | while read file; do dir=`dirname $file` base=`basename $file .o` dump=$dir/$base.dump objdump -d $file > $dump done) done find $dir1 -name '*.dump' | while read dump; do otherdump=`echo $dump | sed "s;$dir1;$dir2;"` diff -u $dump $otherdump done Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
68 lines
2.6 KiB
C
68 lines
2.6 KiB
C
/*
|
|
* Xephyr - A kdrive X server thats runs in a host X window.
|
|
* Authored by Matthew Allum <mallum@openedhand.com>
|
|
*
|
|
* Copyright © 2007 OpenedHand Ltd
|
|
*
|
|
* Permission to use, copy, modify, distribute, and sell this software and its
|
|
* documentation for any purpose is hereby granted without fee, provided that
|
|
* the above copyright notice appear in all copies and that both that
|
|
* copyright notice and this permission notice appear in supporting
|
|
* documentation, and that the name of OpenedHand Ltd not be used in
|
|
* advertising or publicity pertaining to distribution of the software without
|
|
* specific, written prior permission. OpenedHand Ltd makes no
|
|
* representations about the suitability of this software for any purpose. It
|
|
* is provided "as is" without express or implied warranty.
|
|
*
|
|
* OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
|
* EVENT SHALL OpenedHand Ltd BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
|
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
* PERFORMANCE OF THIS SOFTWARE.
|
|
*
|
|
* Authors:
|
|
* Dodji Seketeli <dodji@openedhand.com>
|
|
*/
|
|
#ifndef __EPHYRLOG_H__
|
|
#define __EPHYRLOG_H__
|
|
|
|
#include <assert.h>
|
|
#include "os.h"
|
|
|
|
#ifndef DEBUG
|
|
/*we are not in debug mode*/
|
|
#define EPHYR_LOG(...)
|
|
#define EPHYR_LOG_ERROR(...)
|
|
#endif /*!DEBUG */
|
|
|
|
#define ERROR_LOG_LEVEL 3
|
|
#define INFO_LOG_LEVEL 4
|
|
|
|
#ifndef EPHYR_LOG
|
|
#define EPHYR_LOG(...) \
|
|
LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, "in %s:%d:%s: ",\
|
|
__FILE__, __LINE__, __func__) ; \
|
|
LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, __VA_ARGS__)
|
|
#endif /*nomadik_log */
|
|
|
|
#ifndef EPHYR_LOG_ERROR
|
|
#define EPHYR_LOG_ERROR(...) \
|
|
LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, "Error:in %s:%d:%s: ",\
|
|
__FILE__, __LINE__, __func__) ; \
|
|
LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, __VA_ARGS__)
|
|
#endif /*EPHYR_LOG_ERROR */
|
|
|
|
#ifndef EPHYR_RETURN_IF_FAIL
|
|
#define EPHYR_RETURN_IF_FAIL(cond) \
|
|
if (!(cond)) {EPHYR_LOG_ERROR("condition %s failed\n", #cond);return;}
|
|
#endif /*nomadik_return_if_fail */
|
|
|
|
#ifndef EPHYR_RETURN_VAL_IF_FAIL
|
|
#define EPHYR_RETURN_VAL_IF_FAIL(cond,val) \
|
|
if (!(cond)) {EPHYR_LOG_ERROR("condition %s failed\n", #cond);return val;}
|
|
#endif /*nomadik_return_val_if_fail */
|
|
|
|
#endif /*__EPHYRLOG_H__*/
|