avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-12-14 01:44:58 +00:00
Code Issues Projects Releases Wiki Activity

Replace string arrays with const char * and allocated space (part 1)

Browse Source 
This commit deals with default_programmer, default_serial, default_parallel
and default_spi. The long term objective is to remove all fixed-size buffers
from the structures that lexer.l and config_gram.y deal with.
This commit is contained in:
Stefan Rueger
2022-08-09 21:45:04 +01:00
parent 22c4dbf23e
commit 7375477f70
5 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.c
View File

@@ -314,10 +314,11 @@ int main(int argc, char * argv [])
else
progname = argv[0];
default_parallel[0] = 0;
default_serial[0] = 0;
default_spi[0] = 0;
default_bitclock = 0.0;
default_programmer = "";
default_parallel = "";
default_serial = "";
default_spi = "";
default_bitclock = 0.0;
init_config();
@@ -351,7 +352,7 @@ int main(int argc, char * argv [])
quell_progress = 0;
exitspecs = NULL;
pgm = NULL;
programmer = default_programmer;
programmer = cfg_strdup("main()", default_programmer);
verbose = 0;
baudrate = 0;
bitclock = 0.0;
@@ -755,7 +756,7 @@ int main(int argc, char * argv [])
int dev_opts = 0;
// Developer option -c <wildcard>/[ASsrt] prints programmer description(s) and exits
if(programmer && (strcmp(programmer, "*") == 0 || strchr(programmer, '/'))) {
dev_output_pgm_defs(programmer);
dev_output_pgm_defs(cfg_strdup("main()", programmer));
dev_opts = 1;
}
// Developer option -p <wildcard>/[dASsrcow*t] prints part description(s) and exits
@@ -849,11 +850,11 @@ int main(int argc, char * argv [])
switch (pgm->conntype)
{
case CONNTYPE_PARALLEL:
port = default_parallel;
port = cfg_strdup("main()", default_parallel);
break;
case CONNTYPE_SERIAL:
port = default_serial;
port = cfg_strdup("main()", default_serial);
break;
case CONNTYPE_USB: