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

Fix up Cvar_MakeAlias's error checking.

Browse source
This commit is contained in:
Bill Currie 2011-07-05 20:50:02 +09:00
parent d2894a6f68
commit a7291943f7
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/QF/cvar.h
View file

@ -83,7 +83,7 @@ cvar_t *Cvar_Get (const char *name, const char *value, int cvarflags,
cvar_t *Cvar_FindAlias (const char *alias_name); cvar_t *Cvar_FindAlias (const char *alias_name);
void Cvar_MakeAlias (const char *name, cvar_t *cvar); cvar_t *Cvar_MakeAlias (const char *name, cvar_t *cvar);
// equivelants to "<name> <variable>" typed at the console // equivelants to "<name> <variable>" typed at the console
void Cvar_Set (cvar_t *var, const char *value); void Cvar_Set (cvar_t *var, const char *value);

17
libs/util/cvar.c
View file

@ -82,21 +82,27 @@ Cvar_FindAlias (const char *alias_name)
return 0; return 0;
} }
void cvar_t *
Cvar_MakeAlias (const char *name, cvar_t *cvar) Cvar_MakeAlias (const char *name, cvar_t *cvar)
{ {
cvar_alias_t *alias; cvar_alias_t *alias;
cvar_t *var; cvar_t *var;
if (Cmd_Exists (name)) { if (Cmd_Exists (name)) {
Sys_Printf ("CAlias_Get: %s is a command\n", name); Sys_Printf ("Cvar_MakeAlias: %s is a command\n", name);
return; return 0;
} }
if (Cvar_FindVar (name)) { if (Cvar_FindVar (name)) {
Sys_Printf ("CAlias_Get: tried to alias used cvar name %s\n", name); Sys_Printf ("Cvar_MakeAlias: %s is a cvar\n",
return; name);
return 0;
} }
var = Cvar_FindAlias (name); var = Cvar_FindAlias (name);
if (var && var != cvar) {
Sys_Printf ("Cvar_MakeAlias: %s is an alias to %s\n",
name, var->name);
return 0;
}
if (!var) { if (!var) {
alias = (cvar_alias_t *) calloc (1, sizeof (cvar_alias_t)); alias = (cvar_alias_t *) calloc (1, sizeof (cvar_alias_t));
@ -106,6 +112,7 @@ Cvar_MakeAlias (const char *name, cvar_t *cvar)
alias->cvar = cvar; alias->cvar = cvar;
Hash_Add (calias_hash, alias); Hash_Add (calias_hash, alias);
} }
return cvar;
} }
VISIBLE float VISIBLE float