mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit/debug: remove filename hack with a more elegant one

Browse Source
This commit is contained in:
Stefan Seyfried
2016-01-10 18:33:27 +01:00
parent 949e42445d
commit 2ee9ca5471
5 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -275,6 +275,12 @@ fi
fi
fi
# hack to define a short filename also for out-of-tree build
if test `dirname $0` = `pwd`; then
HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__=__FILE__'
else
HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__="\"$(subst $(srcdir)/,,$(abspath $<))\""'
fi
#
# Check for libtdservicedb - the new one - for testing only
#

1
src/driver/scanepg.cpp
View File

@@ -17,7 +17,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#define __NFILE__ 1
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

1
src/gui/scan_setup.cpp
View File

@@ -59,7 +59,6 @@
#include <zapit/getservices.h>
#include <zapit/scan.h>
#include <zapit/zapit.h>
#define __NFILE__ 1
#include <zapit/debug.h>
#include <set>

1
src/neutrino.cpp
View File

@@ -29,7 +29,6 @@
#include <config.h>
#endif
#define __NFILE__ 1
#define NEUTRINO_CPP
#include <stdio.h>

27
src/zapit/include/zapit/debug.h
View File

@@ -2,7 +2,7 @@
* $Id: debug.h,v 1.7 2003/04/30 04:39:03 obi Exp $
*
* (C) 2002-2003 Andreas Oberritter <obi@tuxbox.org>
* (C) 2011,2013 Stefan Seyfried
* (C) 2011,2013,2016 Stefan Seyfried
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -45,35 +45,18 @@
/* zapit.cpp */
extern int zapit_debug;
#if defined __NFILE__
/* this is ugly.
* __FILE__ here is /.../zapit/include/debug.h when building outside the
* source tree, but it is ../../src/zapit/include/zapit/debug.h (relative),
* when building inside the source_tree.
* So we cannot find the real filename here. Hack: when including this file
* from src/neutrino.cpp, src/gui/..., __NFILE__ is defined => strip less characters
* Later on, __FILE__ is the real filename, so if it starts with ../ now, the build
* is from within the source tree => __FILE__ is only basename => strip nothing */
static int __striplen = (strncmp(__FILE__, "../", 3) == 0) ? 0 :
(strstr(__FILE__, "src/zapit") != NULL) ? (strstr(__FILE__, "src/zapit") - __FILE__ + 4) : 0;
#else
static int __striplen = (strncmp(__FILE__, "../", 3) == 0) ? 0 :
(strstr(__FILE__, "src/zapit") != NULL) ? (strstr(__FILE__, "src/zapit") - __FILE__ + 14) : 0;
#endif
#define __SHORTFILE__ (__FILE__ + __striplen)
#define DBG(fmt, args...) \
do { \
if (zapit_debug) \
fprintf(stdout, "[%s:%s:%d] " fmt, \
__SHORTFILE__, __FUNCTION__, \
__file__, __func__, \
__LINE__ , ## args); \
} while (0)
#define ERROR(str) \
do { \
fprintf(stderr, "[%s:%s:%d] %s: %s\n", \
__SHORTFILE__, __FUNCTION__, \
__file__, __func__, \
__LINE__, str, strerror(errno)); \
} while (0)
@@ -82,14 +65,14 @@ static int __striplen = (strncmp(__FILE__, "../", 3) == 0) ? 0 :
#define INFO(fmt, args...) \
do { \
fprintf(stdout, "[%s:%s:%d] " fmt "\n", \
__SHORTFILE__, __FUNCTION__, \
__file__, __func__, \
__LINE__ , ## args); \
} while (0)
#define WARN(fmt, args...) \
do { \
fprintf(stderr, "[%s:%s:%d] " fmt "\n", \
__SHORTFILE__, __FUNCTION__, \
__file__, __func__, \
__LINE__ , ## args); \
} while (0)