Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

shorten file path in logs

Browse source 
Couldn't figure out how to do it at compile-time on Android.
This commit is contained in:
Eric House 2023-10-29 08:08:34 -07:00
parent 2331cde2e7
commit 28318eb38a
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/android/jni/andutils.c
View file

@ -979,7 +979,11 @@ void
android_debugff(const char* func, const char* file, const char* fmt, ...) android_debugff(const char* func, const char* file, const char* fmt, ...)
{ {
char buf[256]; char buf[256];
snprintf( buf, sizeof(buf), "%s:%s(): %s", file, func, fmt ); const char* shortPath = 1 + strrchr(file, '/');
if ( !shortPath ) {
shortPath = file;
}
snprintf( buf, sizeof(buf), "%s:%s(): %s", shortPath, func, fmt );
va_list ap; va_list ap;
va_start( ap, fmt ); va_start( ap, fmt );

2
xwords4/linux/Makefile
View file

@ -251,6 +251,8 @@ ifdef USE_SQLITE
LIBS += -lsqlite3 LIBS += -lsqlite3
LIBS += -lmosquitto LIBS += -lmosquitto
DEFINES += -DUSE_SQLITE DEFINES += -DUSE_SQLITE
DEFINES += -DSHORTFILE=\"$(notdir $<)\"
endif endif
# Turn this off for now. I apparently have a memory problem, but it # Turn this off for now. I apparently have a memory problem, but it
# doesn't make the app unusable for testing while crash on boot does. # doesn't make the app unusable for testing while crash on boot does.

9
xwords4/linux/xptypes.h
View file

@ -77,12 +77,17 @@ extern void linux_debugf(const char*, ...)
__attribute__ ((format (printf, 1, 2))); __attribute__ ((format (printf, 1, 2)));
# define XP_DEBUGF(...) linux_debugf(__VA_ARGS__) # define XP_DEBUGF(...) linux_debugf(__VA_ARGS__)
#ifndef SHORTFILE
# define SHORTFILE __FILE__
#endif
extern void linux_debugff(const char* func, const char* file, int line, const char* fmt, ...) extern void linux_debugff(const char* func, const char* file, int line, const char* fmt, ...)
__attribute__ ((format (printf, 4, 5))); __attribute__ ((format (printf, 4, 5)));
# define XP_LOGFF( FMT, ... ) \ # define XP_LOGFF( FMT, ... ) \
linux_debugff( __func__, __FILE__, __LINE__, FMT, ##__VA_ARGS__ ) linux_debugff( __func__, SHORTFILE, __LINE__, FMT, ##__VA_ARGS__ )
#define XP_LOG(STR) \ #define XP_LOG(STR) \
linux_debugff( __func__, __FILE__, "%s", STR ) linux_debugff( __func__, SHORTFILE, "%s", STR )
#else #else
# define XP_DEBUGF(ch,...) # define XP_DEBUGF(ch,...)