Skip to contentSkip to conversation

Use strcpy for RandR output property names

PATCH In review Michel Dänzer 2 participants 2 messages Jul 24, 2018 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Use strcpy for RandR output property names

From: Michel Dänzer <[email protected]>

Instead of strncpy with the string length. Avoids new warnings with GCC 8:

../../src/drmmode_display.c: In function ‘drmmode_output_create_resources’:
../../src/drmmode_display.c:2240:2: warning: ‘strncpy’ output truncated before terminating nul copying 8 bytes from a string of the same length [-Wstringop-truncation]
strncpy(tearfree_prop->name, "TearFree", 8);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../src/drmmode_display.c:2244:2: warning: ‘strncpy’ output truncated before terminating nul copying 3 bytes from a string of the same length [-Wstringop-truncation]
strncpy(tearfree_prop->enums[0].name, "off", 3);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../src/drmmode_display.c:2245:2: warning: ‘strncpy’ output truncated before terminating nul copying 2 bytes from a string of the same length [-Wstringop-truncation]
strncpy(tearfree_prop->enums[1].name, "on", 2);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../src/drmmode_display.c:2247:2: warning: ‘strncpy’ output truncated before terminating nul copying 4 bytes from a string of the same length [-Wstringop-truncation]
strncpy(tearfree_prop->enums[2].name, "auto", 4);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

(Ported from amdgpu commit f3b2ed37d683f8616a0a31ff63133ddb8fe1a4a3)

---
 src/drmmode_display.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
src/drmmode_display.c +4 -4
index 60c1cdc18..6a0dba2c8 100644
@@ -1686,14 +1686,14 @@ drmmode_output_create_resources(xf86OutputPtr output)
     /* Userspace-only property for TearFree */
     tearfree_prop = calloc(1, sizeof(*tearfree_prop));
     tearfree_prop->flags = DRM_MODE_PROP_ENUM;
-    strncpy(tearfree_prop->name, "TearFree", 8);
+    strcpy(tearfree_prop->name, "TearFree");
     tearfree_prop->count_enums = 3;
     tearfree_prop->enums = calloc(tearfree_prop->count_enums,
 				  sizeof(*tearfree_prop->enums));
-    strncpy(tearfree_prop->enums[0].name, "off", 3);
-    strncpy(tearfree_prop->enums[1].name, "on", 2);
+    strcpy(tearfree_prop->enums[0].name, "off");
+    strcpy(tearfree_prop->enums[1].name, "on");
     tearfree_prop->enums[1].value = 1;
-    strncpy(tearfree_prop->enums[2].name, "auto", 4);
+    strcpy(tearfree_prop->enums[2].name, "auto");
     tearfree_prop->enums[2].value = 2;
     drmmode_output->props[j].mode_prop = tearfree_prop;
     drmmode_output->props[j].value = info->tear_free;
Signature · 6 lines
2.18.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20180724153215.2843-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org

Reviewed-by
#2 lore raw
Quoted 19 lines · Michel Dänzer

From: Michel Dänzer <[email protected]>

Instead of strncpy with the string length. Avoids new warnings with GCC 8:

../../src/drmmode_display.c: In function ‘drmmode_output_create_resources’:
../../src/drmmode_display.c:2240:2: warning: ‘strncpy’ output truncated before terminating nul copying 8 bytes from a string of the same length [-Wstringop-truncation]
strncpy(tearfree_prop->name, "TearFree", 8);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../src/drmmode_display.c:2244:2: warning: ‘strncpy’ output truncated before terminating nul copying 3 bytes from a string of the same length [-Wstringop-truncation]
strncpy(tearfree_prop->enums[0].name, "off", 3);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../src/drmmode_display.c:2245:2: warning: ‘strncpy’ output truncated before terminating nul copying 2 bytes from a string of the same length [-Wstringop-truncation]
strncpy(tearfree_prop->enums[1].name, "on", 2);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../src/drmmode_display.c:2247:2: warning: ‘strncpy’ output truncated before terminating nul copying 4 bytes from a string of the same length [-Wstringop-truncation]
strncpy(tearfree_prop->enums[2].name, "auto", 4);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Quoted 3 lines

(Ported from amdgpu commit f3b2ed37d683f8616a0a31ff63133ddb8fe1a4a3)

Quoted 30 lines
---
 src/drmmode_display.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
src/drmmode_display.c +4 -5
index 60c1cdc18..6a0dba2c8 100644
@@ -1686,14 +1686,14 @@ drmmode_output_create_resources(xf86OutputPtr output)
     /* Userspace-only property for TearFree */
     tearfree_prop = calloc(1, sizeof(*tearfree_prop));
     tearfree_prop->flags = DRM_MODE_PROP_ENUM;
-    strncpy(tearfree_prop->name, "TearFree", 8);
+    strcpy(tearfree_prop->name, "TearFree");
     tearfree_prop->count_enums = 3;
     tearfree_prop->enums = calloc(tearfree_prop->count_enums,
                                  sizeof(*tearfree_prop->enums));
-    strncpy(tearfree_prop->enums[0].name, "off", 3);
-    strncpy(tearfree_prop->enums[1].name, "on", 2);
+    strcpy(tearfree_prop->enums[0].name, "off");
+    strcpy(tearfree_prop->enums[1].name, "on");
     tearfree_prop->enums[1].value = 1;
-    strncpy(tearfree_prop->enums[2].name, "auto", 4);
+    strcpy(tearfree_prop->enums[2].name, "auto");
     tearfree_prop->enums[2].value = 2;
     drmmode_output->props[j].mode_prop = tearfree_prop;
     drmmode_output->props[j].value = info->tear_free;
--

2.18.0

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx