guillm/42sh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: clean merge of pretty-print with no memory leaks

Browse source
This commit is contained in:
Matteo Flebus 2026-01-22 17:19:17 +01:00
parent f2e44d93f4
commit 2f2509f1c9
1 changed files with 7 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/utils/ast/ast.c
View file

@ -1,3 +1,5 @@
#define _POSIX_C_SOURCE 12344
#include "ast.h" #include "ast.h"
#include <assert.h> #include <assert.h>
@ -8,9 +10,8 @@
void ast_free(struct ast **node) void ast_free(struct ast **node)
{ {
if (!node) if (*node == NULL)
if (*node == NULL) return;
return;
// ast void does not need to be freed. // ast void does not need to be freed.
if (ast_is_if(*node)) if (ast_is_if(*node))
ast_free_if(ast_get_if(*node)); ast_free_if(ast_get_if(*node));
@ -22,6 +23,9 @@ void ast_free(struct ast **node)
ast_free_and_or(ast_get_and_or(*node)); ast_free_and_or(ast_get_and_or(*node));
else if (ast_is_redir(*node)) else if (ast_is_redir(*node))
ast_free_redir(ast_get_redir(*node)); ast_free_redir(ast_get_redir(*node));
free(*node);
*node = NULL;
} }
struct ast *ast_create(enum ast_type type, void *data) struct ast *ast_create(enum ast_type type, void *data)
@ -36,57 +40,6 @@ struct ast *ast_create(enum ast_type type, void *data)
return node; return node;
} }
/* struct ast *ast_create_if(struct ast *condition, struct ast *then_clause,
struct ast *else_clause)
{
struct ast_if *if_data = malloc(sizeof(struct ast_if));
if (!if_data)
return NULL;
if_data->condition = condition;
if_data->then_clause = then_clause;
if_data->else_clause = else_clause;
return ast_create(AST_IF, if_data);
}
struct ast *ast_create_cmd(struct list *cmd)
{
struct ast_cmd *cmd_data = malloc(sizeof(struct ast_cmd));
if (!cmd_data)
return NULL;
cmd_data->cmd = cmd;
return ast_create(AST_CMD, cmd_data);
} */
/*
bool ast_is_if(struct ast *node)
{
assert(node != NULL);
return node->type == AST_IF;
}
bool ast_is_cmd(struct ast *node)
{
assert(node != NULL);
return node->type == AST_CMD;
}
struct ast_if *ast_get_if(struct ast *node)
{
assert(node != NULL);
assert(node->type == AST_IF);
return (struct ast_if *)node->data;
}
struct ast_cmd *ast_get_cmd(struct ast *node)
{
assert(node != NULL);
assert(node->type == AST_CMD);
return (struct ast_cmd *)node->data;
}
*/
static void ast_print_dot_recursive(struct ast *node, FILE *out) static void ast_print_dot_recursive(struct ast *node, FILE *out)
{ {
if (!node) if (!node)