greg/dmrconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

No need to limit length of CSV fields for uv380.

Browse Source
This commit is contained in:
Serge Vakulenko 2018-11-23 22:24:06 -08:00
parent 7aaa39f6e4
commit 7fe111abef
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
d868uv.c
View File

@ -2817,6 +2817,13 @@ static void d868uv_write_csv(radio_device_t *radio, FILE *csv)
return; return;
} }
while (csv_read(csv, &radioid, &callsign, &name, &city, &state, &country, &remarks)) { while (csv_read(csv, &radioid, &callsign, &name, &city, &state, &country, &remarks)) {
radioid = trim_spaces(radioid, 16);
callsign = trim_spaces(callsign, 16);
name = trim_spaces(name, 16);
city = trim_spaces(city, 15);
state = trim_spaces(state, 16);
country = trim_spaces(country, 16);
remarks = trim_spaces(remarks, 16);
//printf("%s,%s,%s,%s,%s,%s,%s\n", radioid, callsign, name, city, state, country, remarks); //printf("%s,%s,%s,%s,%s,%s,%s\n", radioid, callsign, name, city, state, country, remarks);
unsigned id = strtoul(radioid, 0, 10); unsigned id = strtoul(radioid, 0, 10);

14
util.c
View File

@ -820,13 +820,13 @@ again:
if ((p = strchr(*remarks, ',')) != 0) if ((p = strchr(*remarks, ',')) != 0)
*p = 0; *p = 0;
*radioid = trim_spaces(trim_quotes(*radioid), 16); *radioid = trim_spaces(trim_quotes(*radioid), 100);
*callsign = trim_spaces(trim_quotes(*callsign), 16); *callsign = trim_spaces(trim_quotes(*callsign), 100);
*name = trim_spaces(trim_quotes(*name), 16); *name = trim_spaces(trim_quotes(*name), 100);
*city = trim_spaces(trim_quotes(*city), 15); *city = trim_spaces(trim_quotes(*city), 100);
*state = trim_spaces(trim_quotes(*state), 16); *state = trim_spaces(trim_quotes(*state), 100);
*country = trim_spaces(trim_quotes(*country), 16); *country = trim_spaces(trim_quotes(*country), 100);
*remarks = trim_spaces(trim_quotes(*remarks), 16); *remarks = trim_spaces(trim_quotes(*remarks), 100);
//printf("%s,%s,%s,%s,%s,%s,%s\n", *radioid, *callsign, *name, *city, *state, *country, *remarks); //printf("%s,%s,%s,%s,%s,%s,%s\n", *radioid, *callsign, *name, *city, *state, *country, *remarks);
if (**radioid < '1' || **radioid > '9') if (**radioid < '1' || **radioid > '9')