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

Exchange of fprintf(stderr, ...) with avrdude_message(...).

Browse Source 
This change was made for the shared library, since library functions
should not write to std-streams directly. Instead avrdude_message()
has to be implemented by the library user. For the avrdude application
this function is implemented in main.c.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1305 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
awachtler
2014-05-18 08:41:46 +00:00
parent b9093f88dc
commit 7b43620402
45 changed files with 2380 additions and 2896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
ser_posix.c
View File

@@ -91,7 +91,7 @@ static speed_t serial_baud_lookup(long baud)
* a warning (if we are verbose) and return the raw rate
*/
if (verbose > 0)
fprintf(stderr, "%s: serial_baud_lookup(): Using non-standard baud rate: %ld",
avrdude_message("%s: serial_baud_lookup(): Using non-standard baud rate: %ld",
progname, baud);
return baud;
@@ -111,7 +111,7 @@ static int ser_setspeed(union filedescriptor *fd, long baud)
*/
rc = tcgetattr(fd->ifd, &termios);
if (rc < 0) {
fprintf(stderr, "%s: ser_setspeed(): tcgetattr() failed",
avrdude_message("%s: ser_setspeed(): tcgetattr() failed",
progname);
return -errno;
}
@@ -135,7 +135,7 @@ static int ser_setspeed(union filedescriptor *fd, long baud)
rc = tcsetattr(fd->ifd, TCSANOW, &termios);
if (rc < 0) {
fprintf(stderr, "%s: ser_setspeed(): tcsetattr() failed\n",
avrdude_message("%s: ser_setspeed(): tcsetattr() failed\n",
progname);
return -errno;
}
@@ -167,13 +167,13 @@ net_open(const char *port, union filedescriptor *fdp)
struct hostent *hp;
if ((hstr = strdup(port)) == NULL) {
fprintf(stderr, "%s: net_open(): Out of memory!\n",
avrdude_message("%s: net_open(): Out of memory!\n",
progname);
return -1;
}
if (((pstr = strchr(hstr, ':')) == NULL) || (pstr == hstr)) {
fprintf(stderr, "%s: net_open(): Mangled host:port string \"%s\"\n",
avrdude_message("%s: net_open(): Mangled host:port string \"%s\"\n",
progname, hstr);
free(hstr);
return -1;
@@ -187,14 +187,14 @@ net_open(const char *port, union filedescriptor *fdp)
pnum = strtoul(pstr, &end, 10);
if ((*pstr == '\0') || (*end != '\0') || (pnum == 0) || (pnum > 65535)) {
fprintf(stderr, "%s: net_open(): Bad port number \"%s\"\n",
avrdude_message("%s: net_open(): Bad port number \"%s\"\n",
progname, pstr);
free(hstr);
return -1;
}
if ((hp = gethostbyname(hstr)) == NULL) {
fprintf(stderr, "%s: net_open(): unknown host \"%s\"\n",
avrdude_message("%s: net_open(): unknown host \"%s\"\n",
progname, hstr);
free(hstr);
return -1;
@@ -203,7 +203,7 @@ net_open(const char *port, union filedescriptor *fdp)
free(hstr);
if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
fprintf(stderr, "%s: net_open(): Cannot open socket: %s\n",
avrdude_message("%s: net_open(): Cannot open socket: %s\n",
progname, strerror(errno));
return -1;
}
@@ -214,7 +214,7 @@ net_open(const char *port, union filedescriptor *fdp)
memcpy(&(sockaddr.sin_addr.s_addr), hp->h_addr, sizeof(struct in_addr));
if (connect(fd, (struct sockaddr *)&sockaddr, sizeof(sockaddr))) {
fprintf(stderr, "%s: net_open(): Connect failed: %s\n",
avrdude_message("%s: net_open(): Connect failed: %s\n",
progname, strerror(errno));
return -1;
}
@@ -271,7 +271,7 @@ static int ser_open(char * port, union pinfo pinfo, union filedescriptor *fdp)
*/
fd = open(port, O_RDWR | O_NOCTTY | O_NONBLOCK);
if (fd < 0) {
fprintf(stderr, "%s: ser_open(): can't open device \"%s\": %s\n",
avrdude_message("%s: ser_open(): can't open device \"%s\": %s\n",
progname, port, strerror(errno));
return -1;
}
@@ -283,9 +283,8 @@ static int ser_open(char * port, union pinfo pinfo, union filedescriptor *fdp)
*/
rc = ser_setspeed(fdp, pinfo.baud);
if (rc) {
fprintf(stderr,
"%s: ser_open(): can't set attributes for device \"%s\": %s\n",
progname, port, strerror(-rc));
avrdude_message("%s: ser_open(): can't set attributes for device \"%s\": %s\n",
progname, port, strerror(-rc));
close(fd);
return -1;
}
@@ -301,9 +300,8 @@ static void ser_close(union filedescriptor *fd)
if (saved_original_termios) {
int rc = tcsetattr(fd->ifd, TCSANOW | TCSADRAIN, &original_termios);
if (rc) {
fprintf(stderr,
"%s: ser_close(): can't reset attributes for device: %s\n",
progname, strerror(errno));
avrdude_message("%s: ser_close(): can't reset attributes for device: %s\n",
progname, strerror(errno));
}
saved_original_termios = 0;
}
@@ -323,29 +321,29 @@ static int ser_send(union filedescriptor *fd, unsigned char * buf, size_t buflen
if (verbose > 3)
{
fprintf(stderr, "%s: Send: ", progname);
avrdude_message("%s: Send: ", progname);
while (buflen) {
unsigned char c = *buf;
if (isprint(c)) {
fprintf(stderr, "%c ", c);
avrdude_message("%c ", c);
}
else {
fprintf(stderr, ". ");
avrdude_message(". ");
}
fprintf(stderr, "[%02x] ", c);
avrdude_message("[%02x] ", c);
buf++;
buflen--;
}
fprintf(stderr, "\n");
avrdude_message("\n");
}
while (len) {
rc = write(fd->ifd, p, (len > 1024) ? 1024 : len);
if (rc < 0) {
fprintf(stderr, "%s: ser_send(): write error: %s\n",
avrdude_message("%s: ser_send(): write error: %s\n",
progname, strerror(errno));
return -1;
}
@@ -378,20 +376,18 @@ static int ser_recv(union filedescriptor *fd, unsigned char * buf, size_t buflen
nfds = select(fd->ifd + 1, &rfds, NULL, NULL, &to2);
if (nfds == 0) {
if (verbose > 1)
fprintf(stderr,
"%s: ser_recv(): programmer is not responding\n",
progname);
avrdude_message("%s: ser_recv(): programmer is not responding\n",
progname);
return -1;
}
else if (nfds == -1) {
if (errno == EINTR || errno == EAGAIN) {
fprintf(stderr,
"%s: ser_recv(): programmer is not responding,reselecting\n",
progname);
avrdude_message("%s: ser_recv(): programmer is not responding,reselecting\n",
progname);
goto reselect;
}
else {
fprintf(stderr, "%s: ser_recv(): select(): %s\n",
avrdude_message("%s: ser_recv(): select(): %s\n",
progname, strerror(errno));
return -1;
}
@@ -399,7 +395,7 @@ static int ser_recv(union filedescriptor *fd, unsigned char * buf, size_t buflen
rc = read(fd->ifd, p, (buflen - len > 1024) ? 1024 : buflen - len);
if (rc < 0) {
fprintf(stderr, "%s: ser_recv(): read error: %s\n",
avrdude_message("%s: ser_recv(): read error: %s\n",
progname, strerror(errno));
return -1;
}
@@ -411,22 +407,22 @@ static int ser_recv(union filedescriptor *fd, unsigned char * buf, size_t buflen
if (verbose > 3)
{
fprintf(stderr, "%s: Recv: ", progname);
avrdude_message("%s: Recv: ", progname);
while (len) {
unsigned char c = *p;
if (isprint(c)) {
fprintf(stderr, "%c ", c);
avrdude_message("%c ", c);
}
else {
fprintf(stderr, ". ");
avrdude_message(". ");
}
fprintf(stderr, "[%02x] ", c);
avrdude_message("[%02x] ", c);
p++;
len--;
}
fprintf(stderr, "\n");
avrdude_message("\n");
}
return 0;
@@ -445,7 +441,7 @@ static int ser_drain(union filedescriptor *fd, int display)
timeout.tv_usec = 250000;
if (display) {
fprintf(stderr, "drain>");
avrdude_message("drain>");
}
while (1) {
@@ -456,7 +452,7 @@ static int ser_drain(union filedescriptor *fd, int display)
nfds = select(fd->ifd + 1, &rfds, NULL, NULL, &timeout);
if (nfds == 0) {
if (display) {
fprintf(stderr, "<drain\n");
avrdude_message("<drain\n");
}
break;
@@ -466,7 +462,7 @@ static int ser_drain(union filedescriptor *fd, int display)
goto reselect;
}
else {
fprintf(stderr, "%s: ser_drain(): select(): %s\n",
avrdude_message("%s: ser_drain(): select(): %s\n",
progname, strerror(errno));
return -1;
}
@@ -474,12 +470,12 @@ static int ser_drain(union filedescriptor *fd, int display)
rc = read(fd->ifd, &buf, 1);
if (rc < 0) {
fprintf(stderr, "%s: ser_drain(): read error: %s\n",
avrdude_message("%s: ser_drain(): read error: %s\n",
progname, strerror(errno));
return -1;
}
if (display) {
fprintf(stderr, "%02x ", buf);
avrdude_message("%02x ", buf);
}
}