Re: opcodes: constify & local meps macros

Commit f375d32b35 changed a generated file.  Edit the source instead.

	* mep.opc (macros): Make static and const.
	(lookup_macro): Return and use const pointer.
	(expand_macro): Make mac param const.
	(expand_string): Make pmacro const.
This commit is contained in:
Alan Modra 2021-07-03 11:39:24 +09:30
parent b4c4b8aaad
commit 4dcdbbd1bc
2 changed files with 12 additions and 5 deletions

View File

@ -1,3 +1,10 @@
2021-07-05 Alan Modra <amodra@gmail.com>
* mep.opc (macros): Make static and const.
(lookup_macro): Return and use const pointer.
(expand_macro): Make mac param const.
(expand_string): Make pmacro const.
2021-07-03 Nick Clifton <nickc@redhat.com>
* 2.37 release branch created.

View File

@ -626,7 +626,7 @@ typedef struct
int len;
} arg;
macro macros[] =
static macro const macros[] =
{
{ "sizeof", "(`1.end + (- `1))"},
{ "startof", "(`1 | 0)" },
@ -659,10 +659,10 @@ str_append (char *dest, const char *input, int len)
return strncat (new_dest, input, len);
}
static macro *
static const macro *
lookup_macro (const char *name)
{
macro *m;
const macro *m;
for (m = macros; m->name; ++m)
if (strncmp (m->name, name, strlen(m->name)) == 0)
@ -672,7 +672,7 @@ lookup_macro (const char *name)
}
static char *
expand_macro (arg *args, int narg, macro *mac)
expand_macro (arg *args, int narg, const macro *mac)
{
char *result = 0, *rescanned_result = 0;
char *e = mac->expansion;
@ -722,7 +722,7 @@ expand_string (const char *in, int first_only)
arg args[MAXARGS];
int state = IN_TEXT;
const char *mark = in;
macro *pmacro = NULL;
const macro *pmacro = NULL;
char *expansion = 0;
char *result = 0;