make the 'name' and 'value' fields in ast_variable const char *
[asterisk/asterisk.git] / main / threadstorage.c
index e5bfc48..a03f3c9 100644 (file)
@@ -78,7 +78,7 @@ void __ast_threadstorage_object_remove(void *key)
        AST_RWLIST_WRLOCK(&tls_objects);
        AST_LIST_TRAVERSE_SAFE_BEGIN(&tls_objects, to, entry) {
                if (to->key == key) {
-                       AST_LIST_REMOVE_CURRENT(&tls_objects, entry);
+                       AST_LIST_REMOVE_CURRENT(entry);
                        break;
                }
        }
@@ -222,8 +222,8 @@ static char *handle_cli_threadstorage_show_summary(struct ast_cli_entry *e, int
 }
 
 static struct ast_cli_entry cli[] = {
-       AST_CLI(handle_cli_threadstorage_show_allocations, "Display outstanding thread local storage allocations"),
-       AST_CLI(handle_cli_threadstorage_show_summary,     "Summarize outstanding memory allocations")
+       AST_CLI_DEFINE(handle_cli_threadstorage_show_allocations, "Display outstanding thread local storage allocations"),
+       AST_CLI_DEFINE(handle_cli_threadstorage_show_summary,     "Summarize outstanding memory allocations")
 };
 
 void threadstorage_init(void)