From afbb696d1936dd21929ce156868b7c5ebd88b544 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 22 Nov 2004 21:05:25 +0000 Subject: [PATCH] XFREE -> free --- ChangeLog | 7 +++++++ src/LR0.c | 2 +- src/closure.c | 2 +- src/conflicts.c | 6 +++--- src/derives.c | 4 ++-- src/gram.c | 4 ++-- src/lalr.c | 18 +++++++++--------- src/nullable.c | 10 +++++----- src/relation.c | 6 +++--- src/scan-skel.l | 2 +- src/system.h | 2 +- src/tables.c | 2 +- 12 files changed, 36 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9298e15a..d3f16205 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-11-22 Paul Eggert + + * src/LR0.c, src/closure.c, src/derives.c, src/gram.c, + src/lalr.c, src/nullable.c, src/relation.c, src/scan-skel.l, + src/system.h, src/tables.c: XFREE -> free, to accommodate + recent change to gnulib xalloc.h. + 2004-11-17 Akim Demaille * data/lalr1.cc (symprint_): Use cdebug_ to avoid warnings. diff --git a/src/LR0.c b/src/LR0.c index 2a75193e..c2a491e8 100644 --- a/src/LR0.c +++ b/src/LR0.c @@ -158,7 +158,7 @@ free_storage (void) free (shiftset); free (kernel_base); free (kernel_size); - XFREE (kernel_items); + free (kernel_items); state_hash_free (); } diff --git a/src/closure.c b/src/closure.c index 228056f7..0b06e99c 100644 --- a/src/closure.c +++ b/src/closure.c @@ -241,7 +241,7 @@ closure (item_number *core, int n) void free_closure (void) { - XFREE (itemset); + free (itemset); bitset_free (ruleset); bitsetv_free (fderives); } diff --git a/src/conflicts.c b/src/conflicts.c index 73ad45e9..bf5d6435 100644 --- a/src/conflicts.c +++ b/src/conflicts.c @@ -488,9 +488,9 @@ conflicts_print (void) expected_rr_conflicts = -1; } - src_ok = + src_ok = src_total == (expected_sr_conflicts == -1 ? 0 : expected_sr_conflicts); - rrc_ok = + rrc_ok = rrc_total == (expected_rr_conflicts == -1 ? 0 : expected_rr_conflicts); /* If there are as many RR conflicts and SR conflicts as @@ -522,7 +522,7 @@ conflicts_print (void) void conflicts_free (void) { - XFREE (conflicts); + free (conflicts); bitset_free (shift_set); bitset_free (look_ahead_set); obstack_free (&solved_conflicts_obstack, NULL); diff --git a/src/derives.c b/src/derives.c index 7e20fe5a..14e7817a 100644 --- a/src/derives.c +++ b/src/derives.c @@ -116,6 +116,6 @@ derives_compute (void) void derives_free (void) { - XFREE (derives[0]); - XFREE (derives); + free (derives[0]); + free (derives); } diff --git a/src/gram.c b/src/gram.c index 223b736d..c99cb9d8 100644 --- a/src/gram.c +++ b/src/gram.c @@ -326,9 +326,9 @@ grammar_rules_never_reduced_report (const char *message) void grammar_free (void) { - XFREE (ritem); + free (ritem); free (rules); - XFREE (token_translations); + free (token_translations); /* Free the symbol table data structure. */ symbols_free (); free_merger_functions (); diff --git a/src/lalr.c b/src/lalr.c index 313bbbda..77f469dd 100644 --- a/src/lalr.c +++ b/src/lalr.c @@ -128,7 +128,7 @@ set_goto_map (void) } } - XFREE (temp_map); + free (temp_map); } @@ -203,10 +203,10 @@ initialize_F (void) relation_digraph (reads, ngotos, &F); for (i = 0; i < ngotos; i++) - XFREE (reads[i]); + free (reads[i]); - XFREE (reads); - XFREE (edge); + free (reads); + free (edge); } @@ -283,8 +283,8 @@ build_relations (void) } } - XFREE (edge); - XFREE (states1); + free (edge); + free (states1); relation_transpose (&includes, ngotos); } @@ -299,9 +299,9 @@ compute_FOLLOWS (void) relation_digraph (includes, ngotos, &F); for (i = 0; i < ngotos; i++) - XFREE (includes[i]); + free (includes[i]); - XFREE (includes); + free (includes); } @@ -319,7 +319,7 @@ compute_look_ahead_tokens (void) for (i = 0; i < nLA; i++) LIST_FREE (goto_list, lookback[i]); - XFREE (lookback); + free (lookback); bitsetv_free (F); } diff --git a/src/nullable.c b/src/nullable.c index d65c4f2b..497ec0ad 100644 --- a/src/nullable.c +++ b/src/nullable.c @@ -126,10 +126,10 @@ nullable_compute (void) } } - XFREE (squeue); - XFREE (rcount); - XFREE (rsets); - XFREE (relts); + free (squeue); + free (rcount); + free (rsets); + free (relts); if (trace_flag & trace_sets) nullable_print (stderr); @@ -139,5 +139,5 @@ nullable_compute (void) void nullable_free (void) { - XFREE (nullable); + free (nullable); } diff --git a/src/relation.c b/src/relation.c index 38b1e825..92d090ef 100644 --- a/src/relation.c +++ b/src/relation.c @@ -112,8 +112,8 @@ relation_digraph (relation r, size_t size, bitsetv *function) if (INDEX[i] == 0 && R[i]) traverse (i); - XFREE (INDEX); - XFREE (VERTICES); + free (INDEX); + free (VERTICES); *function = F; } @@ -170,7 +170,7 @@ relation_transpose (relation *R_arg, int n) /* Free the input: it is replaced with the result. */ for (i = 0; i < n; i++) - XFREE ((*R_arg)[i]); + free ((*R_arg)[i]); free (*R_arg); if (trace_flag & trace_sets) diff --git a/src/scan-skel.l b/src/scan-skel.l index 47b696da..73b1e85d 100644 --- a/src/scan-skel.l +++ b/src/scan-skel.l @@ -58,7 +58,7 @@ int skel_lex (void); fatal ("invalid token in skeleton: %s", yytext); } - XFREE (outname); + free (outname); outname = xstrdup (filename); xfclose (yyout); yyout = xfopen (outname, "w"); diff --git a/src/system.h b/src/system.h index 62640c5c..10abfef5 100644 --- a/src/system.h +++ b/src/system.h @@ -205,7 +205,7 @@ do { \ for (_node = List; _node; _node = _next) \ { \ _next = _node->next; \ - XFREE (_node); \ + free (_node); \ } \ } while (0) diff --git a/src/tables.c b/src/tables.c index 50dd4535..d39e2d8a 100644 --- a/src/tables.c +++ b/src/tables.c @@ -835,7 +835,7 @@ tables_generate (void) { free (froms[i]); free (tos[i]); - XFREE (conflict_tos[i]); + free (conflict_tos[i]); } free (froms); -- 2.45.2