Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-09-23 01:26:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Utilise magic memory tree interface for src/ser_win32.c

Browse Source
This commit is contained in:
Stefan Rueger
2024-04-26 23:31:21 +01:00
parent 80a7fa606c
commit 67a73e609f
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ser_win32.c
View File

@@ -164,14 +164,10 @@ static int net_open(const char *port, union filedescriptor *fdp) {
return -1;
}
if ((hstr = strdup(port)) == NULL) {
pmsg_error("out of memory\n");
return -1;
}
hstr = mmt_strdup(port);
if (((pstr = strchr(hstr, ':')) == NULL) || (pstr == hstr)) {
pmsg_error("mangled host:port string %s\n", hstr);
free(hstr);
mmt_free(hstr);
return -1;
}
@@ -184,17 +180,17 @@ static int net_open(const char *port, union filedescriptor *fdp) {
if ((*pstr == '\0') || (*end != '\0') || (pnum == 0) || (pnum > 65535)) {
pmsg_error("bad port number %s\n", pstr);
free(hstr);
mmt_free(hstr);
return -1;
}
if ((hp = gethostbyname(hstr)) == NULL) {
pmsg_error("unknown host %s\n", hstr);
free(hstr);
mmt_free(hstr);
return -1;
}
free(hstr);
mmt_free(hstr);
if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
FormatMessage(
@@ -256,7 +252,7 @@ static int ser_open(const char *port, union pinfo pinfo, union filedescriptor *f
if (str_casestarts(port, "com")) {
// prepend "\\\\.\\" to name, required for port # >= 10
newname = cfg_malloc(__func__, strlen("\\\\.\\") + strlen(port) + 1);
newname = mmt_malloc(strlen("\\\\.\\") + strlen(port) + 1);
strcpy(newname, "\\\\.\\");
strcat(newname, port);
@@ -305,7 +301,7 @@ static int ser_open(const char *port, union pinfo pinfo, union filedescriptor *f
}
if (newname != 0) {
free(newname);
mmt_free(newname);
}
return 0;
}