diff options
author | Nils Wallménius <nils@rockbox.org> | 2009-07-14 13:57:45 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2009-07-14 13:57:45 +0000 |
commit | 3d4701a6e41616cf581a297bab1451cf2db70249 (patch) | |
tree | f845837c96ffbed7d59ddf8308f3b3e7c40cb8c9 /apps/recorder/radio.c | |
parent | c2900a1bacd5d98b57a0d15ea2add1bc08764057 (diff) | |
download | rockbox-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/recorder/radio.c')
-rw-r--r-- | apps/recorder/radio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 68c45c4f01..c5729ba8b2 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -1138,7 +1138,7 @@ void radio_load_presets(char *filename) | |||
1138 | } | 1138 | } |
1139 | /* Temporary preset, loaded until player shuts down. */ | 1139 | /* Temporary preset, loaded until player shuts down. */ |
1140 | else if(filename[0] == '/') | 1140 | else if(filename[0] == '/') |
1141 | strncpy(filepreset, filename, sizeof(filepreset)); | 1141 | strlcpy(filepreset, filename, sizeof(filepreset)); |
1142 | /* Preset from default directory. */ | 1142 | /* Preset from default directory. */ |
1143 | else | 1143 | else |
1144 | snprintf(filepreset, sizeof(filepreset), "%s/%s.fmr", | 1144 | snprintf(filepreset, sizeof(filepreset), "%s/%s.fmr", |
@@ -1159,8 +1159,7 @@ void radio_load_presets(char *filename) | |||
1159 | { | 1159 | { |
1160 | struct fmstation * const fms = &presets[num_presets]; | 1160 | struct fmstation * const fms = &presets[num_presets]; |
1161 | fms->frequency = f; | 1161 | fms->frequency = f; |
1162 | strncpy(fms->name, name, MAX_FMPRESET_LEN); | 1162 | strlcpy(fms->name, name, MAX_FMPRESET_LEN+1); |
1163 | fms->name[MAX_FMPRESET_LEN] = '\0'; | ||
1164 | num_presets++; | 1163 | num_presets++; |
1165 | } | 1164 | } |
1166 | } | 1165 | } |