Fix use of sizeof with const char pointers (#15705)

spleen1981 · web-flow · commit c5b18b189aa1 · 2023-09-15T17:19:42.000-07:00
diff --git a/retroarch.c b/retroarch.c
@@ -1464,7 +1464,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
          for (i = 0; menu_ctx_drivers[i]; i++)
          {
             const char *opt  = menu_ctx_drivers[i]->ident;
-            *len            += STRLEN_CONST(menu_ctx_drivers[i]->ident) + 1;
+            *len            += strlen(opt) + 1;
 
             /* Don't allow the user to set menu driver to "null" using the UI.
              * Can prevent the user from locking him/herself out of the program. */
@@ -1477,7 +1477,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
          for (i = 0; camera_drivers[i]; i++)
          {
             const char *opt  = camera_drivers[i]->ident;
-            *len            += STRLEN_CONST(camera_drivers[i]->ident) + 1;
+            *len            += strlen(opt) + 1;
 
             string_list_append(s, opt, attr);
          }
@@ -1487,7 +1487,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
          for (i = 0; bluetooth_drivers[i]; i++)
          {
             const char *opt  = bluetooth_drivers[i]->ident;
-            *len            += STRLEN_CONST(bluetooth_drivers[i]->ident) + 1;
+            *len            += strlen(opt) + 1;
 
             string_list_append(s, opt, attr);
          }
@@ -1498,7 +1498,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
          for (i = 0; wifi_drivers[i]; i++)
          {
             const char *opt  = wifi_drivers[i]->ident;
-            *len            += STRLEN_CONST(wifi_drivers[i]->ident) + 1;
+            *len            += strlen(opt) + 1;
 
             string_list_append(s, opt, attr);
          }
@@ -1508,7 +1508,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
          for (i = 0; location_drivers[i]; i++)
          {
             const char *opt  = location_drivers[i]->ident;
-            *len            += STRLEN_CONST(location_drivers[i]->ident) + 1;
+            *len            += strlen(opt) + 1;
 
             string_list_append(s, opt, attr);
          }
@@ -1517,7 +1517,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
          for (i = 0; audio_drivers[i]; i++)
          {
             const char *opt  = audio_drivers[i]->ident;
-            *len            += STRLEN_CONST(audio_drivers[i]->ident) + 1;
+            *len            += strlen(opt) + 1;
 
             string_list_append(s, opt, attr);
          }
@@ -1527,7 +1527,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
          for (i = 0; microphone_drivers[i]; i++)
          {
             const char *opt  = microphone_drivers[i]->ident;
-            *len            += STRLEN_CONST(microphone_drivers[i]->ident) + 1;
+            *len            += strlen(opt) + 1;
 
             string_list_append(s, opt, attr);
          }
@@ -1537,7 +1537,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
          for (i = 0; audio_resampler_driver_find_handle(i); i++)
          {
             const char *opt  = audio_resampler_driver_find_ident(i);
-            *len            += STRLEN_CONST(audio_resampler_driver_find_ident(i)) + 1;
+            *len            += strlen(opt) + 1;
 
             string_list_append(s, opt, attr);
          }
@@ -1546,7 +1546,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
          for (i = 0; video_drivers[i]; i++)
          {
             const char *opt  = video_drivers[i]->ident;
-            *len            += STRLEN_CONST(video_drivers[i]->ident) + 1;
+            *len            += strlen(opt) + 1;
 
             /* Don't allow the user to set video driver to "null" using the UI.
              * Can prevent the user from locking him/herself out of the program. */
@@ -1558,7 +1558,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
          for (i = 0; input_drivers[i]; i++)
          {
             const char *opt  = input_drivers[i]->ident;
-            *len            += STRLEN_CONST(input_drivers[i]->ident) + 1;
+            *len            += strlen(opt) + 1;
 
             /* Don't allow the user to set input driver to "null" using the UI.
              * Can prevent the user from locking him/herself out of the program. */
@@ -1571,7 +1571,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
          for (i = 0; hid_drivers[i]; i++)
          {
             const char *opt  = hid_drivers[i]->ident;
-            *len            += STRLEN_CONST(hid_drivers[i]->ident) + 1;
+            *len            += strlen(opt) + 1;
 
             /* Don't allow the user to set input HID driver to "null" using the UI.
              * Can prevent the user from locking him/herself out of the program. */
@@ -1584,7 +1584,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
          for (i = 0; joypad_drivers[i]; i++)
          {
             const char *opt  = joypad_drivers[i]->ident;
-            *len            += STRLEN_CONST(joypad_drivers[i]->ident) + 1;
+            *len            += strlen(opt) + 1;
 
             /* Don't allow the user to set input joypad driver to "null" using the UI.
              * Can prevent the user from locking him/herself out of the program. */
@@ -1596,7 +1596,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
          for (i = 0; record_drivers[i]; i++)
          {
             const char *opt  = record_drivers[i]->ident;
-            *len            += STRLEN_CONST(record_drivers[i]->ident) + 1;
+            *len            += strlen(opt) + 1;
 
             string_list_append(s, opt, attr);
          }
@@ -1605,7 +1605,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
          for (i = 0; midi_driver_find_handle(i); i++)
          {
             const char *opt  = midi_drivers[i]->ident;
-            *len            += STRLEN_CONST(midi_drivers[i]->ident) + 1;
+            *len            += strlen(opt) + 1;
 
             string_list_append(s, opt, attr);
          }
@@ -1615,7 +1615,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
          for (i = 0; cloud_sync_drivers[i]; i++)
          {
             const char *opt  = cloud_sync_drivers[i]->ident;
-            *len            += STRLEN_CONST(cloud_sync_drivers[i]->ident) + 1;
+            *len            += strlen(opt) + 1;
 
             string_list_append(s, opt, attr);
          }

Original file line number	Diff line number	Diff line change
`@@ -1464,7 +1464,7 @@ struct string_list *string_list_new_special(enum string_list_type type,`
`1464`	`1464`	`for (i = 0; menu_ctx_drivers[i]; i++)`
`1465`	`1465`	`{`
`1466`	`1466`	`const char *opt = menu_ctx_drivers[i]->ident;`
`1467`		`- *len += STRLEN_CONST(menu_ctx_drivers[i]->ident) + 1;`
	`1467`	`+ *len += strlen(opt) + 1;`
`1468`	`1468`
`1469`	`1469`	`/* Don't allow the user to set menu driver to "null" using the UI.`
`1470`	`1470`	`* Can prevent the user from locking him/herself out of the program. */`
`@@ -1477,7 +1477,7 @@ struct string_list *string_list_new_special(enum string_list_type type,`
`1477`	`1477`	`for (i = 0; camera_drivers[i]; i++)`
`1478`	`1478`	`{`
`1479`	`1479`	`const char *opt = camera_drivers[i]->ident;`
`1480`		`- *len += STRLEN_CONST(camera_drivers[i]->ident) + 1;`
	`1480`	`+ *len += strlen(opt) + 1;`
`1481`	`1481`
`1482`	`1482`	`string_list_append(s, opt, attr);`
`1483`	`1483`	`}`
`@@ -1487,7 +1487,7 @@ struct string_list *string_list_new_special(enum string_list_type type,`
`1487`	`1487`	`for (i = 0; bluetooth_drivers[i]; i++)`
`1488`	`1488`	`{`
`1489`	`1489`	`const char *opt = bluetooth_drivers[i]->ident;`
`1490`		`- *len += STRLEN_CONST(bluetooth_drivers[i]->ident) + 1;`
	`1490`	`+ *len += strlen(opt) + 1;`
`1491`	`1491`
`1492`	`1492`	`string_list_append(s, opt, attr);`
`1493`	`1493`	`}`
`@@ -1498,7 +1498,7 @@ struct string_list *string_list_new_special(enum string_list_type type,`
`1498`	`1498`	`for (i = 0; wifi_drivers[i]; i++)`
`1499`	`1499`	`{`
`1500`	`1500`	`const char *opt = wifi_drivers[i]->ident;`
`1501`		`- *len += STRLEN_CONST(wifi_drivers[i]->ident) + 1;`
	`1501`	`+ *len += strlen(opt) + 1;`
`1502`	`1502`
`1503`	`1503`	`string_list_append(s, opt, attr);`
`1504`	`1504`	`}`
`@@ -1508,7 +1508,7 @@ struct string_list *string_list_new_special(enum string_list_type type,`
`1508`	`1508`	`for (i = 0; location_drivers[i]; i++)`
`1509`	`1509`	`{`
`1510`	`1510`	`const char *opt = location_drivers[i]->ident;`
`1511`		`- *len += STRLEN_CONST(location_drivers[i]->ident) + 1;`
	`1511`	`+ *len += strlen(opt) + 1;`
`1512`	`1512`
`1513`	`1513`	`string_list_append(s, opt, attr);`
`1514`	`1514`	`}`
`@@ -1517,7 +1517,7 @@ struct string_list *string_list_new_special(enum string_list_type type,`
`1517`	`1517`	`for (i = 0; audio_drivers[i]; i++)`
`1518`	`1518`	`{`
`1519`	`1519`	`const char *opt = audio_drivers[i]->ident;`
`1520`		`- *len += STRLEN_CONST(audio_drivers[i]->ident) + 1;`
	`1520`	`+ *len += strlen(opt) + 1;`
`1521`	`1521`
`1522`	`1522`	`string_list_append(s, opt, attr);`
`1523`	`1523`	`}`
`@@ -1527,7 +1527,7 @@ struct string_list *string_list_new_special(enum string_list_type type,`
`1527`	`1527`	`for (i = 0; microphone_drivers[i]; i++)`
`1528`	`1528`	`{`
`1529`	`1529`	`const char *opt = microphone_drivers[i]->ident;`
`1530`		`- *len += STRLEN_CONST(microphone_drivers[i]->ident) + 1;`
	`1530`	`+ *len += strlen(opt) + 1;`
`1531`	`1531`
`1532`	`1532`	`string_list_append(s, opt, attr);`
`1533`	`1533`	`}`
`@@ -1537,7 +1537,7 @@ struct string_list *string_list_new_special(enum string_list_type type,`
`1537`	`1537`	`for (i = 0; audio_resampler_driver_find_handle(i); i++)`
`1538`	`1538`	`{`
`1539`	`1539`	`const char *opt = audio_resampler_driver_find_ident(i);`
`1540`		`- *len += STRLEN_CONST(audio_resampler_driver_find_ident(i)) + 1;`
	`1540`	`+ *len += strlen(opt) + 1;`
`1541`	`1541`
`1542`	`1542`	`string_list_append(s, opt, attr);`
`1543`	`1543`	`}`
`@@ -1546,7 +1546,7 @@ struct string_list *string_list_new_special(enum string_list_type type,`
`1546`	`1546`	`for (i = 0; video_drivers[i]; i++)`
`1547`	`1547`	`{`
`1548`	`1548`	`const char *opt = video_drivers[i]->ident;`
`1549`		`- *len += STRLEN_CONST(video_drivers[i]->ident) + 1;`
	`1549`	`+ *len += strlen(opt) + 1;`
`1550`	`1550`
`1551`	`1551`	`/* Don't allow the user to set video driver to "null" using the UI.`
`1552`	`1552`	`* Can prevent the user from locking him/herself out of the program. */`
`@@ -1558,7 +1558,7 @@ struct string_list *string_list_new_special(enum string_list_type type,`
`1558`	`1558`	`for (i = 0; input_drivers[i]; i++)`
`1559`	`1559`	`{`
`1560`	`1560`	`const char *opt = input_drivers[i]->ident;`
`1561`		`- *len += STRLEN_CONST(input_drivers[i]->ident) + 1;`
	`1561`	`+ *len += strlen(opt) + 1;`
`1562`	`1562`
`1563`	`1563`	`/* Don't allow the user to set input driver to "null" using the UI.`
`1564`	`1564`	`* Can prevent the user from locking him/herself out of the program. */`
`@@ -1571,7 +1571,7 @@ struct string_list *string_list_new_special(enum string_list_type type,`
`1571`	`1571`	`for (i = 0; hid_drivers[i]; i++)`
`1572`	`1572`	`{`
`1573`	`1573`	`const char *opt = hid_drivers[i]->ident;`
`1574`		`- *len += STRLEN_CONST(hid_drivers[i]->ident) + 1;`
	`1574`	`+ *len += strlen(opt) + 1;`
`1575`	`1575`
`1576`	`1576`	`/* Don't allow the user to set input HID driver to "null" using the UI.`
`1577`	`1577`	`* Can prevent the user from locking him/herself out of the program. */`
`@@ -1584,7 +1584,7 @@ struct string_list *string_list_new_special(enum string_list_type type,`
`1584`	`1584`	`for (i = 0; joypad_drivers[i]; i++)`
`1585`	`1585`	`{`
`1586`	`1586`	`const char *opt = joypad_drivers[i]->ident;`
`1587`		`- *len += STRLEN_CONST(joypad_drivers[i]->ident) + 1;`
	`1587`	`+ *len += strlen(opt) + 1;`
`1588`	`1588`
`1589`	`1589`	`/* Don't allow the user to set input joypad driver to "null" using the UI.`
`1590`	`1590`	`* Can prevent the user from locking him/herself out of the program. */`
`@@ -1596,7 +1596,7 @@ struct string_list *string_list_new_special(enum string_list_type type,`
`1596`	`1596`	`for (i = 0; record_drivers[i]; i++)`
`1597`	`1597`	`{`
`1598`	`1598`	`const char *opt = record_drivers[i]->ident;`
`1599`		`- *len += STRLEN_CONST(record_drivers[i]->ident) + 1;`
	`1599`	`+ *len += strlen(opt) + 1;`
`1600`	`1600`
`1601`	`1601`	`string_list_append(s, opt, attr);`
`1602`	`1602`	`}`
`@@ -1605,7 +1605,7 @@ struct string_list *string_list_new_special(enum string_list_type type,`
`1605`	`1605`	`for (i = 0; midi_driver_find_handle(i); i++)`
`1606`	`1606`	`{`
`1607`	`1607`	`const char *opt = midi_drivers[i]->ident;`
`1608`		`- *len += STRLEN_CONST(midi_drivers[i]->ident) + 1;`
	`1608`	`+ *len += strlen(opt) + 1;`
`1609`	`1609`
`1610`	`1610`	`string_list_append(s, opt, attr);`
`1611`	`1611`	`}`
`@@ -1615,7 +1615,7 @@ struct string_list *string_list_new_special(enum string_list_type type,`
`1615`	`1615`	`for (i = 0; cloud_sync_drivers[i]; i++)`
`1616`	`1616`	`{`
`1617`	`1617`	`const char *opt = cloud_sync_drivers[i]->ident;`
`1618`		`- *len += STRLEN_CONST(cloud_sync_drivers[i]->ident) + 1;`
	`1618`	`+ *len += strlen(opt) + 1;`
`1619`	`1619`
`1620`	`1620`	`string_list_append(s, opt, attr);`
`1621`	`1621`	`}`