kopia lustrzana https://github.com/Hamlib/Hamlib
tests/{memcsv.c,memsave.c}: partially revert commit 4072f9f4
this partially revert the commit 4072f9f4
because it introduced duplication of channel_desc
pull/182/head
rodzic
702535c218
commit
38d76f33bf
|
@ -548,11 +548,6 @@ void dump_csv_name(const channel_cap_t *mem_caps, FILE *f)
|
||||||
fprintf(f, "flags%c", csv_sep);
|
fprintf(f, "flags%c", csv_sep);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mem_caps->channel_desc)
|
|
||||||
{
|
|
||||||
fprintf(f, "channel_desc%c", csv_sep);
|
|
||||||
}
|
|
||||||
|
|
||||||
fprintf(f, "\n");
|
fprintf(f, "\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -708,11 +703,6 @@ int dump_csv_chan(RIG *rig,
|
||||||
fprintf(f, "%x%c", chan.flags, csv_sep);
|
fprintf(f, "%x%c", chan.flags, csv_sep);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mem_caps->channel_desc)
|
|
||||||
{
|
|
||||||
fprintf(f, "%s", chan.channel_desc);
|
|
||||||
}
|
|
||||||
|
|
||||||
fprintf(f, "\n");
|
fprintf(f, "\n");
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -285,12 +285,6 @@ int dump_xml_chan(RIG *rig,
|
||||||
xmlNewProp(node, (unsigned char *) "flags", (unsigned char *) attrbuf);
|
xmlNewProp(node, (unsigned char *) "flags", (unsigned char *) attrbuf);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mem_caps->channel_desc)
|
|
||||||
{
|
|
||||||
sprintf(attrbuf, "%s", chan.channel_desc);
|
|
||||||
xmlNewProp(node, (unsigned char *) "channel_desc", (unsigned char *) attrbuf);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Ładowanie…
Reference in New Issue