git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't display clock on LCD/OLED for MessageBoxes anymore. instead display more of...
[enigma2.git]
/
lib
/
base
/
eerror.h
diff --git
a/lib/base/eerror.h
b/lib/base/eerror.h
index 2d4e979038d244f40ef1172f9324a52217f4b332..6040565e5a40106271ae0eb93527bb176e19f033 100644
(file)
--- a/
lib/base/eerror.h
+++ b/
lib/base/eerror.h
@@
-21,7
+21,7
@@
typedef struct
{
unsigned int address;
unsigned int size;
{
unsigned int address;
unsigned int size;
- char *file;
+ c
onst c
har *file;
void *backtrace[BACKTRACE_DEPTH];
unsigned char btcount;
unsigned short line;
void *backtrace[BACKTRACE_DEPTH];
unsigned char btcount;
unsigned short line;
@@
-41,11
+41,11
@@
static inline void AddTrack(unsigned int addr, unsigned int asize, const char
allocList = new(AllocList);
info.address = addr;
allocList = new(AllocList);
info.address = addr;
- info.file =
strdup(fname)
;
+ info.file =
fname
;
info.line = lnum;
info.size = asize;
info.type = type;
info.line = lnum;
info.size = asize;
info.type = type;
- info.btcount = backtrace( info.backtrace, BACKTRACE_DEPTH );
+ info.btcount =
0; //
backtrace( info.backtrace, BACKTRACE_DEPTH );
singleLock s(memLock);
(*allocList)[addr]=info;
};
singleLock s(memLock);
(*allocList)[addr]=info;
};
@@
-62,14
+62,11
@@
static inline void RemoveTrack(unsigned int addr, unsigned int type)
if ( i->second.type != type )
i->second.type=3;
else
if ( i->second.type != type )
i->second.type=3;
else
- {
- free(i->second.file);
allocList->erase(i);
allocList->erase(i);
- }
}
};
}
};
-inline void * operator new(
unsigned in
t size, const char *file, int line)
+inline void * operator new(
size_
t size, const char *file, int line)
{
void *ptr = (void *)malloc(size);
AddTrack((unsigned int)ptr, size, file, line, 1);
{
void *ptr = (void *)malloc(size);
AddTrack((unsigned int)ptr, size, file, line, 1);
@@
-82,7
+79,7
@@
inline void operator delete(void *p)
free(p);
};
free(p);
};
-inline void * operator new[](
unsigned in
t size, const char *file, int line)
+inline void * operator new[](
size_
t size, const char *file, int line)
{
void *ptr = (void *)malloc(size);
AddTrack((unsigned int)ptr, size, file, line, 2);
{
void *ptr = (void *)malloc(size);
AddTrack((unsigned int)ptr, size, file, line, 2);
@@
-135,17
+132,13
@@
enum { lvlDebug=1, lvlWarning=2, lvlFatal=4 };
inline void eWarning(const char* fmt, ...)
{
}
inline void eWarning(const char* fmt, ...)
{
}
- #define ASSERT(x) do {
x;
} while (0)
+ #define ASSERT(x) do { } while (0)
#endif //DEBUG
void eWriteCrashdump();
#endif // SWIG
#endif //DEBUG
void eWriteCrashdump();
#endif // SWIG
-#ifndef DEBUG
-inline void ePythonOutput(const char *)
-{
-}
-#endif
+void ePythonOutput(const char *);
#endif // __E_ERROR__
#endif // __E_ERROR__