7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update patch to last trunk version of OpenWRT/Compat Wireless

Browse Source
This commit is contained in:
vemax78
2015-01-06 22:56:10 +01:00
parent c7fa31ce56
commit 5fb61094d7
5 changed files with 42 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/capwap_debug.c
View File

@ -15,10 +15,6 @@
#define BACKTRACE_BUFFER 256
#ifndef DEBUG_BREAKPOINT
#define DEBUG_BREAKPOINT() __asm__("int3")
#endif
/* Memory block */
struct capwap_memory_block {
void* item;
@ -41,7 +37,6 @@ void* capwap_alloc_debug(size_t size, const char* file, const int line) {
/* Request size > 0 */
if (size <= 0) {
capwap_logging_debug("%s(%d): Invalid memory size %d", file, line, size);
DEBUG_BREAKPOINT();
exit(CAPWAP_ASSERT_CONDITION);
}
@ -49,7 +44,6 @@ void* capwap_alloc_debug(size_t size, const char* file, const int line) {
block = (struct capwap_memory_block*)malloc(sizeof(struct capwap_memory_block) + size);
if (!block) {
capwap_logging_debug("Out of memory %s(%d)", file, line);
DEBUG_BREAKPOINT();
exit(CAPWAP_OUT_OF_MEMORY);
}
@ -76,22 +70,19 @@ void capwap_free_debug(void* p, const char* file, const int line) {
if (!p) {
capwap_logging_debug("%s(%d): Free NULL pointer", file, line);
DEBUG_BREAKPOINT();
return;
exit(CAPWAP_ASSERT_CONDITION);
}
/* Memory block */
if ((size_t)p <= sizeof(struct capwap_memory_block)) {
capwap_logging_debug("%s(%d): Invalid pointer", file, line);
DEBUG_BREAKPOINT();
return;
exit(CAPWAP_ASSERT_CONDITION);
}
block = (struct capwap_memory_block*)((char*)p - sizeof(struct capwap_memory_block));
if (block->item != p) {
capwap_logging_debug("%s(%d): Invalid pointer", file, line);
DEBUG_BREAKPOINT();
return;
exit(CAPWAP_ASSERT_CONDITION);
}
/* Find memory block */

7
src/common/capwap_debug.h
View File

@ -3,12 +3,7 @@
#ifdef DEBUG
#define DEBUG_BREAKPOINT() __asm__("int3")
#define ASSERT(expr) if (!(expr)) { \
capwap_logging_fatal("Assertion failed \'%s\': %s(%d)", #expr, __FILE__, __LINE__); \
DEBUG_BREAKPOINT(); \
}
#define ASSERT(expr) if (!(expr)) { capwap_logging_fatal("Assertion failed \'%s\': %s(%d)", #expr, __FILE__, __LINE__); }
/* Custom memory management */
#define capwap_alloc(x) capwap_alloc_debug(x, __FILE__, __LINE__)