From b61793acfca0c65a405780ed2a62cec10be5ac39 Mon Sep 17 00:00:00 2001
From: Thomas Jahns <jahns@dkrz.de>
Date: Wed, 25 Mar 2015 12:41:58 +0000
Subject: [PATCH] Simplify control flow in tableInqParCode.
---
src/table.c | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/src/table.c b/src/table.c
index 82a6d90fc..d08d8ef59 100644
--- a/src/table.c
+++ b/src/table.c
@@ -796,27 +796,21 @@ void tableFWriteC(FILE *ptfp, int tableID)
int tableInqParCode(int tableID, char *varname, int *code)
{
- int item, npars;
- int err = 0;
-
- npars = parTable[tableID].npars;
+ int err = 1;
- if ( tableID == UNDEFID || varname == NULL )
+ if ( tableID != UNDEFID && varname != NULL )
{
- err = 1;
- }
- else
- {
- for ( item = 0; item < npars; item++ )
+ int npars = parTable[tableID].npars;
+ for ( int item = 0; item < npars; item++ )
{
- if ( parTable[tableID].pars[item].name )
- if ( strcmp(parTable[tableID].pars[item].name, varname) == 0 )
- {
- *code = parTable[tableID].pars[item].id;
- break;
- }
+ if ( parTable[tableID].pars[item].name
+ && strcmp(parTable[tableID].pars[item].name, varname) == 0 )
+ {
+ *code = parTable[tableID].pars[item].id;
+ err = 0;
+ break;
+ }
}
- if ( item == npars ) err = 1;
}
return (err);
--
GitLab