From 5f6c2cbff7cd778b6487943d62e71ff9e7b04893 Mon Sep 17 00:00:00 2001 From: John Tytgat Date: Sat, 26 Jul 2008 22:29:15 +0000 Subject: - Compiler warning squash - Changed a lineending \n\r -> \n for a couple of files. - More code style conformance. svn path=/trunk/netsurf/; revision=4762 --- desktop/tree.c | 8 ++++---- desktop/tree.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'desktop') diff --git a/desktop/tree.c b/desktop/tree.c index 208483d6f..83b56079f 100644 --- a/desktop/tree.c +++ b/desktop/tree.c @@ -916,7 +916,7 @@ void tree_delete_node(struct tree *tree, struct node *node, bool siblings) { void tree_delete_node_internal(struct tree *tree, struct node *node, bool siblings) { struct node *next, *child; struct node_element *e, *f, *domain, *path; - char *domain_t, *path_t, *name_t; + const char *domain_t, *path_t, *name_t; char *space; assert(node); @@ -939,7 +939,7 @@ void tree_delete_node_internal(struct tree *tree, struct node *node, bool siblin if (e->text) { /* we don't free non-editable titles or URLs */ if ((node->editable) || (node->folder)) - free(e->text); + free((void *)e->text); else { /* only reset non-deleted items */ if (!node->deleted) { @@ -976,7 +976,7 @@ void tree_delete_node_internal(struct tree *tree, struct node *node, bool siblin if (e->data != TREE_ELEMENT_TITLE && e->data != TREE_ELEMENT_URL) { - free(e->text); + free((void *)e->text); e->text = NULL; } } @@ -1128,7 +1128,7 @@ struct node *tree_create_URL_node_shared(struct node *parent, const char *url, const struct url_data *data) { struct node *node; struct node_element *element; - char *title; + const char *title; assert(url && data); diff --git a/desktop/tree.h b/desktop/tree.h index d22efb130..d02f1726e 100644 --- a/desktop/tree.h +++ b/desktop/tree.h @@ -74,7 +74,7 @@ struct node_element { struct node *parent; /* <-- Parent node */ node_element_type type; /* <-- Element type */ struct node_element_box box; /* <-- Element bounding box */ - char *text; /* <-- Text for the element */ + const char *text; /* <-- Text for the element */ struct node_sprite *sprite; /* <-- Sprite for the element */ struct node_element *next; /* <-- Next node element */ node_element_data data; /* <-- Data being represented */ -- cgit v1.2.3