summaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2018-07-01 16:57:38 -0400
committerDavid S. Miller <davem@davemloft.net>2018-07-02 09:41:58 -0400
commit414372f633e378b3ef7443ce0f0370a6a4e5808b (patch)
treeb32219b799e3f7f26b09b0df76c6911dbec45338 /drivers/isdn
parent100ec4bf09679583d45316fcf13611f66a8d0f88 (diff)
TTY: isdn: Replace strncpy with memcpy
gcc 8.1.0 complains: drivers/isdn/i4l/isdn_tty.c: In function 'isdn_tty_suspend.isra.1': drivers/isdn/i4l/isdn_tty.c:790:3: warning: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length drivers/isdn/i4l/isdn_tty.c:778:6: note: length computed here drivers/isdn/i4l/isdn_tty.c: In function 'isdn_tty_resume': drivers/isdn/i4l/isdn_tty.c:880:3: warning: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length drivers/isdn/i4l/isdn_tty.c:817:6: note: length computed here Using strncpy() is indeed less than perfect since the length of data to be copied has already been determined with strlen(). Replace strncpy() with memcpy() to address the warning and optimize the code a little. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/i4l/isdn_tty.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 960f26348bb5..b730037a0e2d 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -787,7 +787,7 @@ isdn_tty_suspend(char *id, modem_info *info, atemu *m)
787 cmd.parm.cmsg.para[3] = 4; /* 16 bit 0x0004 Suspend */ 787 cmd.parm.cmsg.para[3] = 4; /* 16 bit 0x0004 Suspend */
788 cmd.parm.cmsg.para[4] = 0; 788 cmd.parm.cmsg.para[4] = 0;
789 cmd.parm.cmsg.para[5] = l; 789 cmd.parm.cmsg.para[5] = l;
790 strncpy(&cmd.parm.cmsg.para[6], id, l); 790 memcpy(&cmd.parm.cmsg.para[6], id, l);
791 cmd.command = CAPI_PUT_MESSAGE; 791 cmd.command = CAPI_PUT_MESSAGE;
792 cmd.driver = info->isdn_driver; 792 cmd.driver = info->isdn_driver;
793 cmd.arg = info->isdn_channel; 793 cmd.arg = info->isdn_channel;
@@ -877,7 +877,7 @@ isdn_tty_resume(char *id, modem_info *info, atemu *m)
877 cmd.parm.cmsg.para[3] = 5; /* 16 bit 0x0005 Resume */ 877 cmd.parm.cmsg.para[3] = 5; /* 16 bit 0x0005 Resume */
878 cmd.parm.cmsg.para[4] = 0; 878 cmd.parm.cmsg.para[4] = 0;
879 cmd.parm.cmsg.para[5] = l; 879 cmd.parm.cmsg.para[5] = l;
880 strncpy(&cmd.parm.cmsg.para[6], id, l); 880 memcpy(&cmd.parm.cmsg.para[6], id, l);
881 cmd.command = CAPI_PUT_MESSAGE; 881 cmd.command = CAPI_PUT_MESSAGE;
882 info->dialing = 1; 882 info->dialing = 1;
883// strcpy(dev->num[i], n); 883// strcpy(dev->num[i], n);