Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Removed assertion list terminator (just do it like a normal linked li…
…st).
  • Loading branch information
icculus committed Apr 19, 2011
1 parent 5c174fa commit 696109a349b9153574a2733c32886a27cd02b0f2
Showing with 11 additions and 19 deletions.
  1. +2 −3 include/SDL_assert.h
  2. +9 −16 src/SDL_assert.c
@@ -205,7 +205,7 @@ extern DECLSPEC void SDLCALL SDL_SetAssertionHandler(
*
* <code>
* const SDL_assert_data *item = SDL_GetAssertionReport();
* while (item->condition) {
* while (item) {
* printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\n",
* item->condition, item->function, item->filename,
* item->linenum, item->trigger_count,
@@ -214,8 +214,7 @@ extern DECLSPEC void SDLCALL SDL_SetAssertionHandler(
* }
* </code>
*
* \return List of all assertions. This never returns NULL,
* even if there are no items.
* \return List of all assertions.
* \sa SDL_ResetAssertionReport
*/
extern DECLSPEC const SDL_assert_data * SDLCALL SDL_GetAssertionReport(void);
@@ -44,8 +44,7 @@ SDL_PromptAssertion(const SDL_assert_data *data, void *userdata);
* We keep all triggered assertions in a singly-linked list so we can
* generate a report later.
*/
static SDL_assert_data assertion_list_terminator = { 0, 0, 0, 0, 0, 0, 0 };
static SDL_assert_data *triggered_assertions = &assertion_list_terminator;
static SDL_assert_data *triggered_assertions = NULL;

static SDL_mutex *assertion_mutex = NULL;
static SDL_AssertionHandler assertion_handler = SDL_PromptAssertion;
@@ -217,7 +216,8 @@ static void SDL_AddAssertionToReport(SDL_assert_data *data)
{
/* (data) is always a static struct defined with the assert macros, so
we don't have to worry about copying or allocating them. */
if (data->next == NULL) { /* not yet added? */
data->trigger_count++;
if (data->trigger_count == 1) { /* not yet added? */
data->next = triggered_assertions;
triggered_assertions = data;
}
@@ -226,19 +226,14 @@ static void SDL_AddAssertionToReport(SDL_assert_data *data)

static void SDL_GenerateAssertionReport(void)
{
const SDL_assert_data *item;
const SDL_assert_data *item = triggered_assertions;

/* only do this if the app hasn't assigned an assertion handler. */
if (assertion_handler != SDL_PromptAssertion)
return;

item = SDL_GetAssertionReport();
if (item->condition)
{
if ((item != NULL) && (assertion_handler != SDL_PromptAssertion)) {
debug_print("\n\nSDL assertion report.\n");
debug_print("All SDL assertions between last init/quit:\n\n");

while (item->condition) {
while (item != NULL) {
debug_print(
"'%s'\n"
" * %s (%s:%d)\n"
@@ -398,8 +393,6 @@ SDL_ReportAssertion(SDL_assert_data *data, const char *func, const char *file,

SDL_AddAssertionToReport(data);

data->trigger_count++;

assertion_running++;
if (assertion_running > 1) { /* assert during assert! Abort. */
if (assertion_running == 2) {
@@ -472,16 +465,16 @@ const SDL_assert_data *SDL_GetAssertionReport(void)

void SDL_ResetAssertionReport(void)
{
SDL_assert_data *item = triggered_assertions;
SDL_assert_data *next = NULL;
for (item = triggered_assertions; item->condition; item = next) {
SDL_assert_data *item;
for (item = triggered_assertions; item != NULL; item = next) {
next = (SDL_assert_data *) item->next;
item->always_ignore = SDL_FALSE;
item->trigger_count = 0;
item->next = NULL;
}

triggered_assertions = &assertion_list_terminator;
triggered_assertions = NULL;
}

/* vi: set ts=4 sw=4 expandtab: */

0 comments on commit 696109a

Please sign in to comment.