qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-31 08:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[gamecode] Remove the wart from def and function names

Browse source 
I never liked the leading s_ (though I guess it means one is supposed to
interpret the int as a string pointer, but meh).
This commit is contained in:
Bill Currie 2021-12-31 15:02:31 +09:00
parent 6990bd5752
commit be474d9937
16 changed files with 57 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/qfcc/source/def.c
View file

@ -284,7 +284,7 @@ def_to_ddef (def_t *def, ddef_t *ddef, int aux)
type = type->t.fldptr.type; // aux is true only for fields
ddef->type = type->type;
ddef->ofs = def->offset;
ddef->s_name = ReuseString (def->name);
ddef->name = ReuseString (def->name);
}
static int

2
tools/qfcc/source/disassemble.c
View file

@ -76,7 +76,7 @@ disassemble_progs (progs_t *pr)
memcpy (func.parm_size, desc->parm_size, sizeof (func.parm_size));
func.descriptor = desc;
Sys_Printf ("%s:\n", PR_GetString (pr, desc->s_name));
Sys_Printf ("%s:\n", PR_GetString (pr, desc->name));
pr->pr_xfunction = &func;
}
PR_PrintStatement (pr, &pr->pr_statements[i], 2 | (verbosity > 1));

4
tools/qfcc/source/dump_globals.c
View file

@ -251,7 +251,7 @@ dump_functions (progs_t *pr)
for (i = 0; i < pr->progs->numfunctions; i++) {
dfunction_t *func = &pr->pr_functions[i];
name = PR_GetString (pr, func->s_name);
name = PR_GetString (pr, func->name);
start = func->first_statement;
if (start > 0)
@ -275,7 +275,7 @@ dump_functions (progs_t *pr)
continue;
}
printf (" %d %s:%d %d %d %d %x\n", aux->function,
PR_GetString (pr, func->s_file), aux->source_line,
PR_GetString (pr, func->file), aux->source_line,
aux->line_info,
aux->local_defs, aux->num_locals,
aux->return_type);

4
tools/qfcc/source/dump_lines.c
View file

@ -79,8 +79,8 @@ progs_get_func_data (unsigned func_index, void *data)
func_data.function = aux_func->function;
if (aux_func->function < (unsigned int) pr->progs->numfunctions) {
func = pr->pr_functions + aux_func->function;
func_data.source_file = pr->pr_strings + func->s_file;
func_data.source_name = pr->pr_strings + func->s_name;
func_data.source_file = pr->pr_strings + func->file;
func_data.source_name = pr->pr_strings + func->name;
func_data.first_statement = func->first_statement;
}
return &func_data;

6
tools/qfcc/source/idstuff.c
View file

@ -215,7 +215,7 @@ WriteProgdefs (dprograms_t *progs, const char *filename)
strings = (char *) progs + progs->ofs_strings;
for (i = 0; i < progs->numglobaldefs; i++) {
def = (ddef_t *) ((char *) progs + progs->ofs_globaldefs) + i;
name = strings + def->s_name;
name = strings + def->name;
if (!strcmp (name, "end_sys_globals"))
break;
if (!def->ofs)
@ -253,7 +253,7 @@ WriteProgdefs (dprograms_t *progs, const char *filename)
dasprintf (dstr, "typedef struct\n{\n");
for (i = 0, j = 0; i < progs->numglobaldefs; i++) {
def = (ddef_t *) ((char *) progs + progs->ofs_globaldefs) + i;
name = strings + def->s_name;
name = strings + def->name;
if (!strcmp (name, "end_sys_fields"))
break;
@ -265,7 +265,7 @@ WriteProgdefs (dprograms_t *progs, const char *filename)
continue;
fdef = (ddef_t *) ((char *) progs + progs->ofs_fielddefs) + j++;
if (fdef->s_name != def->s_name)
if (fdef->name != def->name)
internal_error (0, "def and field order messup");
switch (fdef->type) {

6
tools/qfcc/source/obj_file.c
View file

@ -819,7 +819,7 @@ qfo_def_to_ddef (qfo_t *qfo, const qfo_def_t *def, ddef_t *ddef)
{
ddef->type = get_def_type (qfo, def->type);
ddef->ofs = def->offset;
ddef->s_name = def->name;
ddef->name = def->name;
if (!(def->flags & QFOD_NOSAVE)
&& !(def->flags & QFOD_CONSTANT)
&& (def->flags & QFOD_GLOBAL)
@ -1079,8 +1079,8 @@ qfo_to_progs (qfo_t *in_qfo, int *size)
if (!options.code.local_merging)
locals_start += align_globals_size (df->locals);
df->profile = 0;
df->s_name = qf->name;
df->s_file = qf->file;
df->name = qf->name;
df->file = qf->file;
function_params (qfo, qf, df);
}

8
tools/qfcc/source/qfcc.c
View file

@ -231,19 +231,19 @@ WriteProgs (dprograms_t *progs, int size)
func->parm_start = LittleLong (func->parm_start);
func->locals = LittleLong (func->locals);
func->profile = LittleLong (func->profile);
func->s_name = LittleLong (func->s_name);
func->s_file = LittleLong (func->s_file);
func->name = LittleLong (func->name);
func->file = LittleLong (func->file);
func->numparms = LittleLong (func->numparms);
}
for (i = 0; i < progs->numglobaldefs; i++) {
globaldefs[i].type = LittleShort (globaldefs[i].type);
globaldefs[i].ofs = LittleShort (globaldefs[i].ofs);
globaldefs[i].s_name = LittleLong (globaldefs[i].s_name);
globaldefs[i].name = LittleLong (globaldefs[i].name);
}
for (i = 0; i < progs->numfielddefs; i++) {
fielddefs[i].type = LittleShort (fielddefs[i].type);
fielddefs[i].ofs = LittleShort (fielddefs[i].ofs);
fielddefs[i].s_name = LittleLong (fielddefs[i].s_name);
fielddefs[i].name = LittleLong (fielddefs[i].name);
}
for (i = 0; i < progs->numglobals; i++)
globals[i].integer_var = LittleLong (globals[i].integer_var);