Fix all(?) sites where ThrowException was missing

jepler · jepler · commit 29dcd24a51a0 · 2022-08-21T17:06:02.000-05:00
diff --git a/src/libnml/inifile/inifile.cc b/src/libnml/inifile/inifile.cc
@@ -116,28 +116,27 @@ IniFile::Find(int *result, StrIntPair *pPair,
         // in a buffer. Just pick a suitable ErrorCode for now.
 	if (lineno)
 	    *lineno = 0;
-        return(ERR_TAG_NOT_FOUND);
+        return ThrowException(ERR_TAG_NOT_FOUND);
     }
 
     if(sscanf(pStr, "%i", &tmp) == 1){
         *result = tmp;
 	if (lineno)
 	    *lineno = lineNo;
-        return(ERR_NONE);
+        return ThrowException(ERR_NONE);
     }
 
     while(pPair->pStr != NULL){
         if(strcasecmp(pStr, pPair->pStr) == 0){
             *result = pPair->value;
 	    if (lineno)
 		*lineno = lineNo;
-            return(ERR_NONE);
+            return ThrowException(ERR_NONE);
         }
         pPair++;
     }
 
-    ThrowException(ERR_CONVERSION);
-    return(ERR_CONVERSION);
+    return ThrowException(ERR_CONVERSION);
 }
 
 
@@ -153,7 +152,7 @@ IniFile::Find(double *result, StrDoublePair *pPair,
         // in a buffer. Just pick a suitable ErrorCode for now.
 	if (lineno)
 	    *lineno = 0;
-        return(ERR_TAG_NOT_FOUND);
+        return ThrowException(ERR_TAG_NOT_FOUND);
     }
 
     if(sscanf(pStr, "%lf", &tmp) == 1){
@@ -162,21 +161,20 @@ IniFile::Find(double *result, StrDoublePair *pPair,
         *result = tmp;
 	if (lineno)
 	    *lineno = lineNo;
-        return(ERR_NONE);
+        return ThrowException(ERR_NONE);
     }
 
     while(pPair->pStr != NULL){
         if(strcasecmp(pStr, pPair->pStr) == 0){
             *result = pPair->value;
 	    if (lineno)
 		*lineno = lineNo;
-            return(ERR_NONE);
+            return ThrowException(ERR_NONE);
         }
         pPair++;
     }
 
-    ThrowException(ERR_CONVERSION);
-    return(ERR_CONVERSION);
+    return ThrowException(ERR_CONVERSION);
 }
 
 
@@ -231,13 +229,11 @@ IniFile::Find(const char *_tag, const char *_section, int _num, int *lineno)
 
             if (NULL == fgets(line, LINELEN + 1, fp)) {
                 /* got to end of file without finding it */
-                ThrowException(ERR_SECTION_NOT_FOUND);
-                return(NULL);
+                return ThrowException(ERR_SECTION_NOT_FOUND, nullptr);
             }
 
             if(check_line_endings(line)) {
-                ThrowException(ERR_CONVERSION);
-                return(NULL);
+                return ThrowException(ERR_SECTION_NOT_FOUND, nullptr);
             }
 
             /* got a line */
@@ -272,13 +268,11 @@ IniFile::Find(const char *_tag, const char *_section, int _num, int *lineno)
         /* check for end of file */
         if (NULL == fgets(line, LINELEN + 1, (FILE *) fp)) {
             /* got to end of file without finding it */
-            ThrowException(ERR_TAG_NOT_FOUND);
-            return(NULL);
+            return ThrowException(ERR_TAG_NOT_FOUND, nullptr);
         }
 
         if(check_line_endings(line)) {
-            ThrowException(ERR_CONVERSION);
-            return(NULL);
+            ThrowException(ERR_CONVERSION, nullptr);
         }
 
         /* got a line */
@@ -310,8 +304,7 @@ IniFile::Find(const char *_tag, const char *_section, int _num, int *lineno)
               fprintf(stderr,
                  "INIFILE lineno=%d:Too many backslash line extends (limit=%d)\n",
                  lineNo, MAX_EXTEND_LINES);
-              ThrowException(ERR_OVER_EXTENDED);
-              return(NULL);
+              return ThrowException(ERR_OVER_EXTENDED, nullptr);
            }
            continue; // get next line to extend
         } else {
@@ -335,8 +328,7 @@ IniFile::Find(const char *_tag, const char *_section, int _num, int *lineno)
         /* check for '[' char-- if so, it's a section tag, and we're out
            of our section */
         if (NULL != section && nonWhite[0] == '[') {
-            ThrowException(ERR_TAG_NOT_FOUND);
-            return(NULL);
+            return ThrowException(ERR_TAG_NOT_FOUND, nullptr);
         }
 
         len = strlen(tag);
@@ -359,8 +351,7 @@ IniFile::Find(const char *_tag, const char *_section, int _num, int *lineno)
             valueString = AfterEqual(nonWhite);
             /* Eliminate white space at the end of a line also. */
             if (NULL == valueString) {
-                ThrowException(ERR_TAG_NOT_FOUND);
-                return(NULL);
+                return ThrowException(ERR_TAG_NOT_FOUND, nullptr);
             }
             endValueString = valueString + strlen(valueString) - 1;
             while (*endValueString == ' ' || *endValueString == '\t'
@@ -375,8 +366,7 @@ IniFile::Find(const char *_tag, const char *_section, int _num, int *lineno)
         /* else continue */
     }
 
-    ThrowException(ERR_TAG_NOT_FOUND);
-    return(NULL);
+    return ThrowException(ERR_TAG_NOT_FOUND, nullptr);
 }
 
 const char *
@@ -387,8 +377,7 @@ IniFile::FindString(char *dest, size_t n, const char *_tag, const char *_section
         return res;
     int r = snprintf(dest, n, "%s", res);
     if(r < 0 || (size_t)r >= n) {
-        ThrowException(ERR_CONVERSION);
-        return NULL;
+        return ThrowException(ERR_CONVERSION, nullptr);
     }
     return dest;
 }
@@ -411,9 +400,7 @@ IniFile::CheckIfOpen(void)
     if(IsOpen())
         return(true);
 
-    ThrowException(ERR_NOT_OPEN);
-
-    return(false);
+    return ThrowException(ERR_NOT_OPEN, false);
 }
 
 
@@ -430,7 +417,7 @@ IniFile::LockFile(void)
             fclose(fp);
 
         fp = NULL;
-        return(false);
+        return ThrowException(ERR_LIMITS, false);
     }
 
     return(true);
@@ -452,27 +439,25 @@ IniFile::TildeExpansion(const char *file, char *path, size_t size)
 
     int res = snprintf(path, size, "%s", file);
     if(res < 0 || (size_t)res >= size)
-        return ERR_CONVERSION;
+        return ThrowException(ERR_CONVERSION);
 
     if (strlen(file) < 2 || !(file[0] == '~' && file[1] == '/')) {
 	/* no tilde expansion required, or unsupported
            tilde expansion type requested */
-	return ERR_NONE;
+	return ThrowException(ERR_NONE);
     }
 
     home = getenv("HOME");
     if (!home) {
-        ThrowException(ERR_CONVERSION);
-	return ERR_CONVERSION;
+	return ThrowException(ERR_CONVERSION);
     }
 
     res = snprintf(path, size, "%s%s", home, file + 1);
     if(res < 0 || (size_t)res >= size) {
-        ThrowException(ERR_CONVERSION);
-        return ERR_CONVERSION;
+        return ThrowException(ERR_CONVERSION);
     }
 
-    return ERR_NONE;
+    return ThrowException(ERR_NONE);
 }
 
 int
@@ -482,7 +467,7 @@ TildeExpansion(const char *file, char *path, size_t size)
     return !f.TildeExpansion(file, path, size);
 }
 
-void
+IniFile::ErrorCode
 IniFile::ThrowException(ErrorCode errCode)
 {
     if(errCode & errMask){
@@ -493,6 +478,7 @@ IniFile::ThrowException(ErrorCode errCode)
         exception.lineNo = lineNo;
         throw(exception);
     }
+    return errCode;
 }
 
 
diff --git a/src/libnml/inifile/inifile.hh b/src/libnml/inifile/inifile.hh
@@ -70,8 +70,7 @@ public:
             return(errCode);
 
         if((tmp > max) || (tmp < min)) {
-            ThrowException(ERR_LIMITS);
-            return(ERR_LIMITS);
+            return ThrowException(ERR_LIMITS);
         }
 
         *result = tmp;
@@ -91,8 +90,7 @@ public:
         try {
             *result = boost::lexical_cast<T>(tmp);
         } catch (boost::bad_lexical_cast &) {
-            ThrowException(ERR_CONVERSION);
-            return(ERR_CONVERSION);
+            return ThrowException(ERR_CONVERSION);
         }
 
         return(ERR_NONE);
@@ -158,7 +156,11 @@ private:
 
     bool                        CheckIfOpen(void);
     bool                        LockFile(void);
-    void                        ThrowException(ErrorCode);
+    ErrorCode                   ThrowException(ErrorCode);
+    template<typename T> T      ThrowException(ErrorCode e, T val) {
+        return ThrowException(e), val;
+
+    }
     char                        *AfterEqual(const char *string);
     char                        *SkipWhite(const char *string);
 };
