From 2ce71fa9830958c83c08b53a960aaa97fcee122f Mon Sep 17 00:00:00 2001
From: Thomas Jahns <jahns@dkrz.de>
Date: Wed, 25 Mar 2015 12:41:56 +0000
Subject: [PATCH] Simplify control flow in tableInqParName.
---
src/table.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/table.c b/src/table.c
index 7525c79c4..82a6d90fc 100644
--- a/src/table.c
+++ b/src/table.c
@@ -825,27 +825,21 @@ int tableInqParCode(int tableID, char *varname, int *code)
int tableInqParName(int tableID, int code, char *varname)
{
- int item, npars;
- int err = 0;
-
- npars = parTable[tableID].npars;
+ int err = 1;
- if ( tableID == UNDEFID )
- {
- err = 1;
- }
- else
+ if ( tableID != UNDEFID )
{
- for ( item = 0; item < npars; item++ )
+ int npars = parTable[tableID].npars;
+ for ( int item = 0; item < npars; item++ )
{
if ( parTable[tableID].pars[item].id == code )
{
if ( parTable[tableID].pars[item].name )
strcpy(varname, parTable[tableID].pars[item].name); //FIXME: This may overrun the supplied buffer!
+ err = 0;
break;
}
}
- if ( item == npars ) err = 1;
}
return (err);
--
GitLab