Remove most of the use of else after return from JS library code. N…

…FC (#17450)

This is small code size win but it looks like it only effects the
unoptimized (non-closure) build.  Still good coding style anyway.

I noticed this while working on #17449 and wrong a little command line
to try to find all these:

```
$ pcregrep -n -M 'return[^\n]*;\n\s*}\s*else\s*{' src/*.js
```

src/IDBStore.js

@@ -70,9 +70,8 @@
         var result = event.target.result;
         if (!result) {
           return callback('file ' + id + ' not found');
-        } else {
-          return callback(null, result);
         }
+        return callback(null, result);
       };
       req.onerror = function(error) {
         callback(error);

src/jsifier.js

@@ -47,9 +47,8 @@ function stringifyWithFunctions(obj) {
   if (obj === null || typeof obj != 'object') return JSON.stringify(obj);
   if (Array.isArray(obj)) {
     return '[' + obj.map(stringifyWithFunctions).join(',') + ']';
-  } else {
-    return '{' + Object.keys(obj).map((key) => escapeJSONKey(key) + ':' + stringifyWithFunctions(obj[key])).join(',') + '}';
   }
+  return '{' + Object.keys(obj).map((key) => escapeJSONKey(key) + ':' + stringifyWithFunctions(obj[key])).join(',') + '}';
 }
 
 function isDefined(symName) {

src/library.js

@@ -827,12 +827,10 @@ mergeInto(LibraryManager.library, {
           // this date is after the start of the first week of this year
           if (compareByDay(firstWeekStartNextYear, thisDate) <= 0) {
             return thisDate.getFullYear()+1;
-          } else {
-            return thisDate.getFullYear();
           }
-        } else {
-          return thisDate.getFullYear()-1;
+          return thisDate.getFullYear();
         }
+        return thisDate.getFullYear()-1;
     }
 
     var EXPANSION_RULES_2 = {
@@ -899,9 +897,8 @@ mergeInto(LibraryManager.library, {
       '%p': function(date) {
         if (date.tm_hour >= 0 && date.tm_hour < 12) {
           return 'AM';
-        } else {
-          return 'PM';
         }
+        return 'PM';
       },
       '%S': function(date) {
         return leadingNulls(date.tm_sec, 2);
@@ -2181,10 +2178,9 @@ mergeInto(LibraryManager.library, {
     // reads the  next  entry  from  the  protocols 'database' or return NULL if 'eof'
     if (_setprotoent.index === Protocols.list.length) {
       return 0;
-    } else {
-      var result = Protocols.list[_setprotoent.index++];
-      return result;
     }
+    var result = Protocols.list[_setprotoent.index++];
+    return result;
   },
 
   getprotobyname__deps: ['setprotoent', '$Protocols'],

src/library_c_preprocessor.js

@@ -132,11 +132,10 @@ mergeInto(LibraryManager.library, {
                   expanded += pp() + str.substring(j, lineEnd);
                 }
                 return expandMacros(expanded, 0);
-              } else {
-                out += symbol;
-                i = j-1;
-                break;
               }
+              out += symbol;
+              i = j-1;
+              break;
             }
           }
         } else {

src/library_egl.js

@@ -112,21 +112,19 @@ var LibraryEGL = {
   eglInitialize__proxy: 'sync',
   eglInitialize__sig: 'iiii',
   eglInitialize: function(display, majorVersion, minorVersion) {
-    if (display == 62000 /* Magic ID for Emscripten 'default display' */) {
-      if (majorVersion) {
-        {{{ makeSetValue('majorVersion', '0', '1', 'i32') }}}; // Advertise EGL Major version: '1'
-      }
-      if (minorVersion) {
-        {{{ makeSetValue('minorVersion', '0', '4', 'i32') }}}; // Advertise EGL Minor version: '4'
-      }
-      EGL.defaultDisplayInitialized = true;
-      EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
-      return 1;
-    }
-    else {
+    if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
       EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
       return 0;
     }
+    if (majorVersion) {
+      {{{ makeSetValue('majorVersion', '0', '1', 'i32') }}}; // Advertise EGL Major version: '1'
+    }
+    if (minorVersion) {
+      {{{ makeSetValue('minorVersion', '0', '4', 'i32') }}}; // Advertise EGL Minor version: '4'
+    }
+    EGL.defaultDisplayInitialized = true;
+    EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
+    return 1;
   },
 
   // EGLAPI EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy);
@@ -554,10 +552,10 @@ var LibraryEGL = {
     if (api == 0x30A0 /* EGL_OPENGL_ES_API */) {
       EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
       return 1;
-    } else { // if (api == 0x30A1 /* EGL_OPENVG_API */ || api == 0x30A2 /* EGL_OPENGL_API */) {
-      EGL.setErrorCode(0x300C /* EGL_BAD_PARAMETER */);
-      return 0;
     }
+    // if (api == 0x30A1 /* EGL_OPENVG_API */ || api == 0x30A2 /* EGL_OPENGL_API */) {
+    EGL.setErrorCode(0x300C /* EGL_BAD_PARAMETER */);
+    return 0;
   },
 
   // EGLAPI EGLenum EGLAPIENTRY eglQueryAPI(void);

src/library_fs.js

@@ -1524,11 +1524,10 @@ FS.staticInit();` +
     },
     findObject: (path, dontResolveLastLink) => {
       var ret = FS.analyzePath(path, dontResolveLastLink);
-      if (ret.exists) {
-        return ret.object;
-      } else {
+      if (!ret.exists) {
         return null;
       }
+      return ret.object;
     },
     analyzePath: (path, dontResolveLastLink) => {
       // operate from within the context of the symlink's target
@@ -1736,9 +1735,8 @@ FS.staticInit();` +
           if (!(xhr.status >= 200 && xhr.status < 300 || xhr.status === 304)) throw new Error("Couldn't load " + url + ". Status: " + xhr.status);
           if (xhr.response !== undefined) {
             return new Uint8Array(/** @type{Array<number>} */(xhr.response || []));
-          } else {
-            return intArrayFromString(xhr.responseText || '', true);
           }
+          return intArrayFromString(xhr.responseText || '', true);
         };
         var lazyArray = this;
         lazyArray.setDataGetter((chunkNum) => {

src/library_glfw.js

@@ -1674,9 +1674,8 @@ var LibraryGLFW = {
   glfwGetJoystickName: function(joy) {
     if (GLFW.joys[joy]) {
       return GLFW.joys[joy].id;
-    } else {
-      return 0;
     }
+    return 0;
   },
 
   glfwSetJoystickCallback__sig: 'ii',

src/library_html5.js

@@ -1093,11 +1093,10 @@ var LibraryHTML5 = {
     }
     if (succeeded) {
       return {{{ cDefine('EMSCRIPTEN_RESULT_SUCCESS') }}};
-    } else {
-      return {{{ cDefine('EMSCRIPTEN_RESULT_FAILED') }}};
     }
+    return {{{ cDefine('EMSCRIPTEN_RESULT_FAILED') }}};
   },
-  
+
   emscripten_unlock_orientation__proxy: 'sync',
   emscripten_unlock_orientation__sig: 'i',
   emscripten_unlock_orientation: function() {
@@ -1565,9 +1564,8 @@ var LibraryHTML5 = {
       if (strategy.deferUntilInEventHandler) {
         JSEvents.deferCall(JSEvents_requestFullscreen, 1 /* priority over pointer lock */, [target, strategy]);
         return {{{ cDefine('EMSCRIPTEN_RESULT_DEFERRED') }}};
-      } else {
-        return {{{ cDefine('EMSCRIPTEN_RESULT_FAILED_NOT_DEFERRED') }}};
       }
+      return {{{ cDefine('EMSCRIPTEN_RESULT_FAILED_NOT_DEFERRED') }}};
     }
 #endif
 
@@ -1878,9 +1876,8 @@ var LibraryHTML5 = {
 #endif
         ) {
         return {{{ cDefine('EMSCRIPTEN_RESULT_INVALID_TARGET') }}};
-      } else {
-        return {{{ cDefine('EMSCRIPTEN_RESULT_NOT_SUPPORTED') }}};
       }
+      return {{{ cDefine('EMSCRIPTEN_RESULT_NOT_SUPPORTED') }}};
     }
     return {{{ cDefine('EMSCRIPTEN_RESULT_SUCCESS') }}};
   },
@@ -1916,9 +1913,8 @@ var LibraryHTML5 = {
       if (deferUntilInEventHandler) {
         JSEvents.deferCall(requestPointerLock, 2 /* priority below fullscreen */, [target]);
         return {{{ cDefine('EMSCRIPTEN_RESULT_DEFERRED') }}};
-      } else {
-        return {{{ cDefine('EMSCRIPTEN_RESULT_FAILED_NOT_DEFERRED') }}};
       }
+      return {{{ cDefine('EMSCRIPTEN_RESULT_FAILED_NOT_DEFERRED') }}};
     }
 #endif
 
@@ -2531,10 +2527,9 @@ var LibraryHTML5 = {
     var canvas = findCanvasEventTarget(target);
     if (canvas) {
       return _emscripten_set_canvas_element_size_calling_thread(target, width, height);
-    } else {
-      return _emscripten_set_canvas_element_size_main_thread(target, width, height);
     }
-  }, 
+    return _emscripten_set_canvas_element_size_main_thread(target, width, height);
+  },
 #else
   emscripten_set_canvas_element_size__deps: ['$JSEvents', '$findCanvasEventTarget'],
   emscripten_set_canvas_element_size__sig: 'iiii',
@@ -2614,10 +2609,9 @@ var LibraryHTML5 = {
     var canvas = findCanvasEventTarget(target);
     if (canvas) {
       return _emscripten_get_canvas_element_size_calling_thread(target, width, height);
-    } else {
-      return _emscripten_get_canvas_element_size_main_thread(target, width, height);
     }
-  }, 
+    return _emscripten_get_canvas_element_size_main_thread(target, width, height);
+  },
 #else
   emscripten_get_canvas_element_size__deps: ['$JSEvents', '$findCanvasEventTarget'],
   emscripten_get_canvas_element_size__sig: 'ippp',

src/library_nodefs.js

@@ -96,11 +96,10 @@ mergeInto(LibraryManager.library, {
           flags ^= k;
         }
       }
-      if (!flags) {
-        return newFlags;
-      } else {
+      if (flags) {
         throw new FS.ErrnoError({{{ cDefine('EINVAL') }}});
       }
+      return newFlags;
     },
     node_ops: {
       getattr: (node) => {

src/library_openal.js

@@ -968,12 +968,11 @@ var LibraryOpenAL = {
       case 0x2015 /* AL_LOOP_POINTS_SOFT */:
         if (buf.length === 0) {
           return [0, 0];
-        } else {
-          return [
-            (buf.audioBuf._loopStart || 0.0) * buf.frequency,
-            (buf.audioBuf._loopEnd || buf.length) * buf.frequency
-          ];
         }
+        return [
+          (buf.audioBuf._loopStart || 0.0) * buf.frequency,
+          (buf.audioBuf._loopEnd || buf.length) * buf.frequency
+        ];
       default:
 #if OPENAL_DEBUG
         err(funcname + '() param 0x' + param.toString(16) + ' is unknown or not implemented');
@@ -1084,9 +1083,8 @@ var LibraryOpenAL = {
       case 0x1009 /* AL_BUFFER */:
         if (src.type === 0x1028 /* AL_STATIC */) {
           return src.bufQueue[0].id;
-        } else {
-          return 0;
         }
+        return 0;
       case 0x100A /* AL_GAIN */:
         return src.gain.gain.value;
        case 0x100D /* AL_MIN_GAIN */:
@@ -1098,15 +1096,13 @@ var LibraryOpenAL = {
       case 0x1015 /* AL_BUFFERS_QUEUED */:
         if (src.bufQueue.length === 1 && src.bufQueue[0].id === 0) {
           return 0;
-        } else {
-          return src.bufQueue.length;
         }
+        return src.bufQueue.length;
       case 0x1016 /* AL_BUFFERS_PROCESSED */:
         if ((src.bufQueue.length === 1 && src.bufQueue[0].id === 0) || src.looping) {
           return 0;
-        } else {
-          return src.bufsProcessed;
         }
+        return src.bufsProcessed;
       case 0x1020 /* AL_REFERENCE_DISTANCE */:
         return src.refDistance;
       case 0x1021 /* AL_ROLLOFF_FACTOR */:
@@ -2083,9 +2079,8 @@ var LibraryOpenAL = {
       var deviceId = AL.newId();
       AL.deviceRefCounts[deviceId] = 0;
       return deviceId;
-    } else {
-      return 0;
     }
+    return 0;
   },
 
   alcCloseDevice__proxy: 'sync',
@@ -2294,9 +2289,8 @@ var LibraryOpenAL = {
   alcGetCurrentContext: function() {
     if (AL.currentCtx !== null) {
       return AL.currentCtx.id;
-    } else {
-      return 0;
     }
+    return 0;
   },
 
   alcMakeContextCurrent__proxy: 'sync',
@@ -2305,20 +2299,18 @@ var LibraryOpenAL = {
     if (contextId === 0) {
       AL.currentCtx = null;
       return 0;
-    } else {
-      AL.currentCtx = AL.contexts[contextId];
-      return 1;
     }
+    AL.currentCtx = AL.contexts[contextId];
+    return 1;
   },
 
   alcGetContextsDevice__proxy: 'sync',
   alcGetContextsDevice__sig: 'ii',
   alcGetContextsDevice: function(contextId) {
     if (contextId in AL.contexts) {
       return AL.contexts[contextId].deviceId;
-    } else {
-      return 0;
     }
+    return 0;
   },
 
   // The spec is vague about what these are actually supposed to do, and NOP is a reasonable implementation
@@ -2686,15 +2678,14 @@ var LibraryOpenAL = {
       }
       break;
     default:
-      if (index === 0) {
-        return _alcGetString(deviceId, param);
-      } else {
+      if (index !== 0) {
 #if OPENAL_DEBUG
         out('alcGetStringiSOFT() with param 0x' + param.toString(16) + ' not implemented yet');
 #endif
         AL.alcErr = 0xA003 /* ALC_INVALID_ENUM */;
         return 0;
       }
+      return _alcGetString(deviceId, param);
     }
 
     ret = allocateUTF8(ret);
@@ -2925,12 +2916,11 @@ var LibraryOpenAL = {
   alGetError: function() {
     if (!AL.currentCtx) {
       return 0xA004 /* AL_INVALID_OPERATION */;
-    } else {
-      // Reset error on get.
-      var err = AL.currentCtx.err;
-      AL.currentCtx.err = 0 /* AL_NO_ERROR */;
-      return err;
     }
+    // Reset error on get.
+    var err = AL.currentCtx.err;
+    AL.currentCtx.err = 0 /* AL_NO_ERROR */;
+    return err;
   },
 
   alIsExtensionPresent__proxy: 'sync',
@@ -3744,9 +3734,8 @@ var LibraryOpenAL = {
 
     if (!AL.buffers[bufferId]) {
       return false;
-    } else {
-      return true;
     }
+    return true;
   },
 
   alBufferData__proxy: 'sync',
@@ -4117,9 +4106,8 @@ var LibraryOpenAL = {
 
     if (!AL.currentCtx.sources[sourceId]) {
       return false;
-    } else {
-      return true;
     }
+    return true;
   },
 
   alSourceQueueBuffers__proxy: 'sync',