- i = get_string(dev, dev->descriptor.iManufacturer,
- &edge_serial->name[0], MAX_NAME_LEN+1);
- edge_serial->name[i++] = ' ';
- get_string(dev, dev->descriptor.iProduct,
- &edge_serial->name[i], MAX_NAME_LEN+2 - i);
+ if ( (i = get_string(dev, dev->descriptor.iManufacturer, &edge_serial->name[0])) != 0) {
+ edge_serial->name[i-1] = ' ';
+ }
+
+ get_string(dev, dev->descriptor.iProduct, &edge_serial->name[i]);