diff options
author | Rafaël Carré <funman@videolan.org> | 2012-05-07 01:19:15 -0400 |
---|---|---|
committer | Rafaël Carré <funman@videolan.org> | 2012-05-07 01:19:15 -0400 |
commit | 803408f18657bcd501737ad29e98a1b4cca0ec37 (patch) | |
tree | b936c2c419dde68598b3556158e77f7a92509e87 /firmware | |
parent | 7ca20810367d9a1b211f242d1b1183dbedeeda68 (diff) | |
download | rockbox-803408f18657bcd501737ad29e98a1b4cca0ec37.tar.gz rockbox-803408f18657bcd501737ad29e98a1b4cca0ec37.zip |
simplify copy_padded
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/usbstack/usb_storage.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c index 211bf474f9..2da3e85a34 100644 --- a/firmware/usbstack/usb_storage.c +++ b/firmware/usbstack/usb_storage.c | |||
@@ -1228,17 +1228,13 @@ static void send_csw(int status) | |||
1228 | 1228 | ||
1229 | static void copy_padded(char *dest, char *src, int len) | 1229 | static void copy_padded(char *dest, char *src, int len) |
1230 | { | 1230 | { |
1231 | int i=0; | 1231 | for (int i = 0; i < len; i++) { |
1232 | while(i<len && src[i]!=0) | 1232 | if (src[i] != 0) { |
1233 | { | 1233 | memset(&dest[i], ' ', len - i); |
1234 | dest[i]=src[i]; | 1234 | return; |
1235 | i++; | 1235 | } |
1236 | } | 1236 | dest[i] = src[i]; |
1237 | while(i<len) | 1237 | } |
1238 | { | ||
1239 | dest[i]=' '; | ||
1240 | i++; | ||
1241 | } | ||
1242 | } | 1238 | } |
1243 | 1239 | ||
1244 | /* build SCSI INQUIRY */ | 1240 | /* build SCSI INQUIRY */ |