- memcpy(result->name, "server:", 7);
- if (!read_setting_s(handle, name,
- result->name + 7, sizeof(result->name) - 7) ||
- !result->name[7]) {
- result->name[0] = '\0';
- return FALSE;
- } else {
+ tmp = read_setting_s(handle, name);
+ if (tmp && *tmp) {
+ strcpy(result->name, "server:");
+ strncpy(result->name + 7, tmp, sizeof(result->name) - 8);
+ result->name[sizeof(result->name)-1] = '\0';
+ sfree(tmp);