From 92a96908aa63ab2c80b31eaba41fe16102098419 Mon Sep 17 00:00:00 2001
From: Thomas Jahns <jahns@dkrz.de>
Date: Wed, 25 Mar 2015 12:42:02 +0000
Subject: [PATCH] Simplify control flow in tableInqParLongname.
---
src/table.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/table.c b/src/table.c
index 8e83364af..f073f75ec 100644
--- a/src/table.c
+++ b/src/table.c
@@ -905,30 +905,24 @@ const char *tableInqParUnitsPtr(int tableID, int code)
int tableInqParLongname(int tableID, int code, char *longname)
{
- int item, npars;
- int err = 0;
-
- npars = parTable[tableID].npars;
-
if ( ((tableID >= 0) & (tableID < MAX_TABLE)) | (tableID == UNDEFID) ) { } else
Error("Invalid table ID %d", tableID);
- if ( tableID == UNDEFID )
- {
- err = 1;
- }
- else
+ int err = 1;
+
+ 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].longname )
strcpy(longname, parTable[tableID].pars[item].longname);
+ err = 0;
break;
}
}
- if ( item == npars ) err = 1;
}
return (err);
--
GitLab