Merge pull request #1527 from debrouxl/minor_improvements_and_fixes

tannewt · web-flow · commit 72f0783b603b · 2019-02-07T12:36:10.000-08:00
Minor improvements
diff --git a/lib/libm_dbl/pow.c b/lib/libm_dbl/pow.c
@@ -125,13 +125,13 @@ double pow(double x, double y)
 		else if (iy >= 0x3ff00000) {
 			k = (iy>>20) - 0x3ff;  /* exponent */
 			if (k > 20) {
-				uint32_t j = ly>>(52-k);
-				if ((j<<(52-k)) == ly)
-					yisint = 2 - (j&1);
+				uint32_t j2 = ly>>(52-k);
+				if ((j2<<(52-k)) == ly)
+					yisint = 2 - (j2&1);
 			} else if (ly == 0) {
-				uint32_t j = iy>>(20-k);
-				if ((j<<(20-k)) == iy)
-					yisint = 2 - (j&1);
+				uint32_t j2 = iy>>(20-k);
+				if ((j2<<(20-k)) == (uint32_t)iy)
+					yisint = 2 - (j2&1);
 			}
 		}
 	}
diff --git a/main.c b/main.c
@@ -185,8 +185,8 @@ bool run_code_py(safe_mode_t safe_mode) {
     } else {
         new_status_color(MAIN_RUNNING);
 
-        const char *supported_filenames[] = STRING_LIST("code.txt", "code.py", "main.py", "main.txt");
-        const char *double_extension_filenames[] = STRING_LIST("code.txt.py", "code.py.txt", "code.txt.txt","code.py.py",
+        static const char *supported_filenames[] = STRING_LIST("code.txt", "code.py", "main.py", "main.txt");
+        static const char *double_extension_filenames[] = STRING_LIST("code.txt.py", "code.py.txt", "code.txt.txt","code.py.py",
                                                     "main.txt.py", "main.py.txt", "main.txt.txt","main.py.py");
 
         stack_resize();
diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c
@@ -43,7 +43,7 @@ void load_serial_number(void) {
     uint8_t raw_id[COMMON_HAL_MCU_PROCESSOR_UID_LENGTH];
     common_hal_mcu_processor_get_uid(raw_id);
 
-    const char nibble_to_hex[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+    static const char nibble_to_hex[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
                                     'A', 'B', 'C', 'D', 'E', 'F'};
     for (int i = 0; i < COMMON_HAL_MCU_PROCESSOR_UID_LENGTH; i++) {
         for (int j = 0; j < 2; j++) {
