@@ -120,11 +120,11 @@
 #define Inf     HUGE_VAL
 
 double
 _SVID_libm_err(double x, double y, int type) {
         struct exception        exc;
-        double                  t, w, ieee_retval;
+        double                  t, w, ieee_retval = 0;
         enum version            lib_version = _lib_version;
         int                     iy;
 
         /* force libm_ieee behavior in SUSv3 mode */
         if ((__xpg6 & _C99SUSv3_math_errexcept) != 0)

@@ -854,16 +854,13 @@
                 exc.retval = x;
                 ieee_retval = 1.0;
                 if (lib_version == strict_ansi) {
                         exc.retval = 1.0;
                 } else if (!matherr(&exc)) {
-                        switch (lib_version) {
-                        case c_issue_4:
-                        case ansi_1:
+                        if ((lib_version == c_issue_4) || (lib_version == ansi_1))
                                 errno = EDOM;
                         }
-                }
                 break;
         case 43:
                 /* log1p(-1) */
                 exc.type = SING;
                 exc.name = "log1p";