frontend/ftesopt.c, rename local variable `ft_curckt' --> `ci'
to avoid compiler warning: 'ft_curckt' hides global declaration
This commit is contained in:
parent
f826ff82f8
commit
f6716af635
|
|
@ -32,7 +32,7 @@ static struct variable *getFTEstat(struct circ *, int);
|
||||||
|
|
||||||
|
|
||||||
struct variable *
|
struct variable *
|
||||||
ft_getstat(struct circ *ft_curckt, char *name)
|
ft_getstat(struct circ *ci, char *name)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
struct variable *v, *vars , *vv = NULL;
|
struct variable *v, *vars , *vv = NULL;
|
||||||
|
|
@ -40,7 +40,7 @@ ft_getstat(struct circ *ft_curckt, char *name)
|
||||||
if (name) {
|
if (name) {
|
||||||
for (i = 0; i < FTEOPTcount; i++)
|
for (i = 0; i < FTEOPTcount; i++)
|
||||||
if (eq(name, FTEOPTtbl[i].keyword)) {
|
if (eq(name, FTEOPTtbl[i].keyword)) {
|
||||||
vv = getFTEstat(ft_curckt, FTEOPTtbl[i].id);
|
vv = getFTEstat(ci, FTEOPTtbl[i].id);
|
||||||
if (vv) {
|
if (vv) {
|
||||||
vv->va_type = FTEOPTtbl[i].dataType;
|
vv->va_type = FTEOPTtbl[i].dataType;
|
||||||
vv->va_name = copy(FTEOPTtbl[i].description);
|
vv->va_name = copy(FTEOPTtbl[i].description);
|
||||||
|
|
@ -54,10 +54,10 @@ ft_getstat(struct circ *ft_curckt, char *name)
|
||||||
} else {
|
} else {
|
||||||
for (i = 0, v = vars = NULL; i < FTEOPTcount; i++) {
|
for (i = 0, v = vars = NULL; i < FTEOPTcount; i++) {
|
||||||
if (v) {
|
if (v) {
|
||||||
v->va_next = getFTEstat(ft_curckt, FTEOPTtbl[i].id);
|
v->va_next = getFTEstat(ci, FTEOPTtbl[i].id);
|
||||||
v = v->va_next;
|
v = v->va_next;
|
||||||
} else {
|
} else {
|
||||||
vars = v = getFTEstat(ft_curckt, FTEOPTtbl[i].id);
|
vars = v = getFTEstat(ci, FTEOPTtbl[i].id);
|
||||||
}
|
}
|
||||||
|
|
||||||
v->va_type = FTEOPTtbl[i].dataType;
|
v->va_type = FTEOPTtbl[i].dataType;
|
||||||
|
|
@ -72,20 +72,20 @@ ft_getstat(struct circ *ft_curckt, char *name)
|
||||||
/* This function fill the value field of the variable */
|
/* This function fill the value field of the variable */
|
||||||
|
|
||||||
static struct variable *
|
static struct variable *
|
||||||
getFTEstat(struct circ *ft_curckt, int id)
|
getFTEstat(struct circ *ci, int id)
|
||||||
{
|
{
|
||||||
|
|
||||||
struct variable *v = TMALLOC(struct variable, 1);
|
struct variable *v = TMALLOC(struct variable, 1);
|
||||||
|
|
||||||
switch (id) {
|
switch (id) {
|
||||||
case FTEOPT_NLDECK:
|
case FTEOPT_NLDECK:
|
||||||
v->va_num = ft_curckt->FTEstats->FTESTATdeckNumLines;
|
v->va_num = ci->FTEstats->FTESTATdeckNumLines;
|
||||||
break;
|
break;
|
||||||
case FTEOPT_NLT:
|
case FTEOPT_NLT:
|
||||||
v->va_real = ft_curckt->FTEstats->FTESTATnetLoadTime;
|
v->va_real = ci->FTEstats->FTESTATnetLoadTime;
|
||||||
break;
|
break;
|
||||||
case FTEOPT_NPT:
|
case FTEOPT_NPT:
|
||||||
v->va_real = ft_curckt->FTEstats->FTESTATnetParseTime;
|
v->va_real = ci->FTEstats->FTESTATnetParseTime;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
tfree(v);
|
tfree(v);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue