* src/main.c: Include macrotab.h.

* src/macrotab.h (macro_entry_s): Constify fields.
Adjust functions prototypes.
* src/macrotab.c (macro_insert): Constify key and value.
(macro_find): Constify key.
(macro_insert): Include 'xalloc.h'
(macro_insert): Use XMALLOC.
(macro_find): Constify return value.
* src/output.c (output_table_data): Rename table to table_data.
(output_parser): Constify macro_key, macro_value.

diff --git a/ChangeLog b/ChangeLog
index 54ddc72676b17dba820ac95d6f3e4b8743e88fc5..a26be138b0b3ac8e34ab210d9f9117a4a670614e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-08-30  Pascal Bart  <pascal.bart@epita.fr>
+
+       * src/main.c: Include macrotab.h.
+       * src/macrotab.h (macro_entry_s): Constify fields. 
+       Adjust functions prototypes.
+       * src/macrotab.c (macro_insert): Constify key and value.
+       (macro_find): Constify key.
+       (macro_insert): Include 'xalloc.h'
+       (macro_insert): Use XMALLOC.
+       (macro_find): Constify return value.
+       * src/output.c (output_table_data): Rename table to table_data.
+       (output_parser): Constify macro_key, macro_value.
+
 2001-08-30  Marc Autret  <autret_m@epita.fr>
 
        * src/reader.c (parse_skel_decl): New.

diff --git a/src/macrotab.c b/src/macrotab.c
index 91944ac28f82e1711f9f02a3133156645da029cb..03353e66f701deff661c2c72e1024e38179051d0 100644 (file)
--- a/src/macrotab.c
+++ b/src/macrotab.c
@@ -20,6 +20,7 @@
 
 #include <string.h>
 
+#include "xalloc.h"
 #include "system.h"
 #include "hash.h"
 #include "files.h"
@@ -110,16 +111,16 @@ macro_init (void)
 }
 
 void 
-macro_insert (char* key, char* value)
+macro_insert (const char *key, const char *value)
 {
-  macro_entry_t* pair = (macro_entry_t*) xmalloc (sizeof (macro_entry_t));
+  macro_entry_t* pair = XMALLOC (macro_entry_t, 1);
   pair->key = key;
   pair->value = value;
   hash_insert (&macro_table, pair);
 }
 
-char*
-macro_find (char* key)
+const char*
+macro_find (const char *key)
 {
   macro_entry_t pair = { key, 0 };
   macro_entry_t* result = hash_find_item (&macro_table, &pair);

diff --git a/src/macrotab.h b/src/macrotab.h
index 6c3a364f7c8153de27fee174fdd1bc316a045b5d..0a40a0ea2d7637a79f31854f7a504aa8aaaacb37 100644 (file)
--- a/src/macrotab.h
+++ b/src/macrotab.h
@@ -25,12 +25,12 @@
 
 typedef struct macro_entry_s
 {
-  char* key;
-  char* value;
+  const char* key;
+  const char* value;
 } macro_entry_t;
 
 void macro_init PARAMS ((void));
-void macro_insert PARAMS ((char* key, char* value));
-char* macro_find PARAMS ((char* key));
+void macro_insert PARAMS ((const char *key, const char *value));
+const char* macro_find PARAMS ((const char *key));
 
 #endif /* not MACROTAB_H_ */

diff --git a/src/main.c b/src/main.c
index 6a89f5c8c7b5ba7044164a70f79b56c863369cea..8592b29487d59efe491d4322c5d6f3df2454bae6 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -34,6 +34,7 @@
 #include "LR0.h"
 #include "conflicts.h"
 #include "print_graph.h"
+#include "macrotab.h"
 
 /* The name this program was run with, for messages.  */
 char *program_name;

diff --git a/src/output.c b/src/output.c
index 21711cb1404fb39b62bff767c6e231d1c50e126a..c8830c4e26f58bbe5a878209f29ae1e49a253ad6 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -130,7 +130,7 @@ struct obstack output_obstack;
 
 static inline void
 output_table_data (struct obstack* oout, 
-                  short* table, 
+                  short* table_data, 
                   short first, 
                   short begin, 
                   short end)
@@ -149,7 +149,7 @@ output_table_data (struct obstack* oout,
        }
       else
        ++j;
-      obstack_fgrow1 (oout, "%6d", table[i]);
+      obstack_fgrow1 (oout, "%6d", table_data[i]);
     }
   obstack_1grow (oout, 0);
 }
@@ -984,8 +984,8 @@ output_parser (void)
       else if ((c = getc (fskel)) == '%')
        {
          /* Read the macro. */
-         char* macro_key = 0;
-         char* macro_value = 0;
+         const char* macro_key = 0;
+         const char* macro_value = 0;
          while (isalnum (c = getc (fskel)) || c == '_')
            obstack_1grow (&macro_obstack, c);
          obstack_1grow (&macro_obstack, 0);