avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-10-09 04:01:01 +00:00
Code Issues Projects Releases Wiki Activity

Change array for copy mem->desc to const char * in term.c

Browse Source
This commit is contained in:
Stefan Rueger
2022-08-15 14:25:58 +01:00
parent a4bfa8247d
commit e332ecf0b4
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libavrdude.h
View File

@@ -283,7 +283,6 @@ typedef struct avrpart {
int lineno; /* config file line number */ int lineno; /* config file line number */
} AVRPART; } AVRPART;
#define AVR_MEMDESCLEN 64
typedef struct avrmem { typedef struct avrmem {
const char *desc; /* memory description ("flash", "eeprom", etc) */ const char *desc; /* memory description ("flash", "eeprom", etc) */
LISTID comments; // Used by developer options -p*/[ASsr...] LISTID comments; // Used by developer options -p*/[ASsr...]

7
src/term.c
View File

@@ -252,7 +252,7 @@ static int cmd_dump(PROGRAMMER * pgm, struct avrpart * p,
} }
enum { read_size = 256 }; enum { read_size = 256 };
static char prevmem[AVR_MEMDESCLEN] = {0x00}; static const char *prevmem = "";
char * memtype = argv[1]; char * memtype = argv[1];
AVRMEM * mem = avr_locate_mem(p, memtype); AVRMEM * mem = avr_locate_mem(p, memtype);
if (mem == NULL) { if (mem == NULL) {
@@ -282,7 +282,7 @@ static int cmd_dump(PROGRAMMER * pgm, struct avrpart * p,
// Get no. bytes to read if present // Get no. bytes to read if present
static int len = read_size; static int len = read_size;
if (argc >= 3) { if (argc >= 3) {
memset(prevmem, 0x00, sizeof(prevmem)); prevmem = cache_string("");
if (strcmp(argv[argc - 1], "...") == 0) { if (strcmp(argv[argc - 1], "...") == 0) {
if (argc == 3) if (argc == 3)
addr = 0; addr = 0;
@@ -303,8 +303,7 @@ static int cmd_dump(PROGRAMMER * pgm, struct avrpart * p,
if (strncmp(prevmem, memtype, strlen(memtype)) != 0) { if (strncmp(prevmem, memtype, strlen(memtype)) != 0) {
addr = 0; addr = 0;
len = read_size; len = read_size;
strncpy(prevmem, memtype, sizeof(prevmem) - 1); prevmem = cache_string(mem->desc);
prevmem[sizeof(prevmem) - 1] = 0;
} }
if (addr >= maxsize) if (addr >= maxsize)
addr = 0; // Wrap around addr = 0; // Wrap around