summaryrefslogtreecommitdiff
path: root/apps/gui/buttonbar.c
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2009-07-14 13:57:45 +0000
committerNils Wallménius <nils@rockbox.org>2009-07-14 13:57:45 +0000
commit3d4701a6e41616cf581a297bab1451cf2db70249 (patch)
treef845837c96ffbed7d59ddf8308f3b3e7c40cb8c9 /apps/gui/buttonbar.c
parentc2900a1bacd5d98b57a0d15ea2add1bc08764057 (diff)
downloadrockbox-3d4701a6e41616cf581a297bab1451cf2db70249.tar.gz
rockbox-3d4701a6e41616cf581a297bab1451cf2db70249.zip
FS#10080
* Move strncpy() from core to the pluginlib * Introduce strlcpy() and use that instead in most places (use memcpy in a few) in core and some plugins * Drop strncpy() from the codec api as no codec used it * Bump codec and plugin api versions git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21863 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/buttonbar.c')
-rw-r--r--apps/gui/buttonbar.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/apps/gui/buttonbar.c b/apps/gui/buttonbar.c
index abf1800bb2..3c343f09ac 100644
--- a/apps/gui/buttonbar.c
+++ b/apps/gui/buttonbar.c
@@ -86,18 +86,15 @@ void gui_buttonbar_set(struct gui_buttonbar * buttonbar,
86 gui_buttonbar_unset(buttonbar); 86 gui_buttonbar_unset(buttonbar);
87 if(caption1) 87 if(caption1)
88 { 88 {
89 strncpy(buttonbar->caption[0], caption1, 7); 89 strlcpy(buttonbar->caption[0], caption1, BUTTONBAR_CAPTION_LENGTH);
90 buttonbar->caption[0][7] = 0;
91 } 90 }
92 if(caption2) 91 if(caption2)
93 { 92 {
94 strncpy(buttonbar->caption[1], caption2, 7); 93 strlcpy(buttonbar->caption[1], caption2, BUTTONBAR_CAPTION_LENGTH);
95 buttonbar->caption[1][7] = 0;
96 } 94 }
97 if(caption3) 95 if(caption3)
98 { 96 {
99 strncpy(buttonbar->caption[2], caption3, 7); 97 strlcpy(buttonbar->caption[2], caption3, BUTTONBAR_CAPTION_LENGTH);
100 buttonbar->caption[2][7] = 0;
101 } 98 }
102} 99}
103 100