avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-12-13 17:34:56 +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:
Axel Wachtler
2014-05-18 08:41:46 +00:00
parent 52dd5cc7ac
commit eb5fcb581f
45 changed files with 2380 additions and 2896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
config.c
View File

@@ -93,7 +93,7 @@ TOKEN * new_token(int primary)
tkn = (TOKEN *)malloc(sizeof(TOKEN));
if (tkn == NULL) {
fprintf(stderr, "new_token(): out of memory\n");
avrdude_message("new_token(): out of memory\n");
exit(1);
}
@@ -145,7 +145,7 @@ TOKEN * number(char * text)
tkn->value.number = atoi(text);
#if DEBUG
fprintf(stderr, "NUMBER(%d)\n", tkn->value.number);
avrdude_message("NUMBER(%d)\n", tkn->value.number);
#endif
return tkn;
@@ -160,7 +160,7 @@ TOKEN * number_real(char * text)
tkn->value.number_real = atof(text);
#if DEBUG
fprintf(stderr, "NUMBER(%g)\n", tkn->value.number_real);
avrdude_message("NUMBER(%g)\n", tkn->value.number_real);
#endif
return tkn;
@@ -175,12 +175,12 @@ TOKEN * hexnumber(char * text)
tkn->value.type = V_NUM;
tkn->value.number = strtoul(text, &e, 16);
if ((e == text) || (*e != 0)) {
fprintf(stderr, "error at %s:%d: can't scan hex number \"%s\"\n",
avrdude_message("error at %s:%d: can't scan hex number \"%s\"\n",
infile, lineno, text);
}
#if DEBUG
fprintf(stderr, "HEXNUMBER(%g)\n", tkn->value.number);
avrdude_message("HEXNUMBER(%g)\n", tkn->value.number);
#endif
return tkn;
@@ -199,13 +199,13 @@ TOKEN * string(char * text)
tkn->value.type = V_STR;
tkn->value.string = (char *) malloc(len+1);
if (tkn->value.string == NULL) {
fprintf(stderr, "id(): out of memory\n");
avrdude_message("id(): out of memory\n");
exit(1);
}
strcpy(tkn->value.string, text);
#if DEBUG
fprintf(stderr, "STRING(%s)\n", tkn->value.string);
avrdude_message("STRING(%s)\n", tkn->value.string);
#endif
return tkn;
@@ -227,33 +227,33 @@ void print_token(TOKEN * tkn)
if (!tkn)
return;
fprintf(stderr, "token = %d = ", tkn->primary);
avrdude_message("token = %d = ", tkn->primary);
switch (tkn->value.type) {
case V_NUM:
fprintf(stderr, "NUMBER, value=%d", tkn->value.number);
avrdude_message("NUMBER, value=%d", tkn->value.number);
break;
case V_NUM_REAL:
fprintf(stderr, "NUMBER, value=%g", tkn->value.number_real);
avrdude_message("NUMBER, value=%g", tkn->value.number_real);
break;
case V_STR:
fprintf(stderr, "STRING, value=%s", tkn->value.string);
avrdude_message("STRING, value=%s", tkn->value.string);
break;
default:
fprintf(stderr, "<other>");
avrdude_message("<other>");
break;
}
fprintf(stderr, "\n");
avrdude_message("\n");
}
void pyytext(void)
{
#if DEBUG
fprintf(stderr, "TOKEN: \"%s\"\n", yytext);
avrdude_message("TOKEN: \"%s\"\n", yytext);
#endif
}
@@ -264,7 +264,7 @@ char * dup_string(const char * str)
s = strdup(str);
if (s == NULL) {
fprintf(stderr, "dup_string(): out of memory\n");
avrdude_message("dup_string(): out of memory\n");
exit(1);
}
@@ -282,7 +282,7 @@ int read_config(const char * file)
f = fopen(file, "r");
if (f == NULL) {
fprintf(stderr, "%s: can't open config file \"%s\": %s\n",
avrdude_message("%s: can't open config file \"%s\": %s\n",
progname, file, strerror(errno));
return -1;
}