Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-09-24 18:16:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

s/\btoken_t\b/token/g

Browse Source
This commit is contained in:
Stefan Rueger
2024-05-18 01:44:00 +01:00
parent fc3891a1ad
commit e566919e6c
2 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/config.c
View File

@@ -46,20 +46,20 @@ double default_bitclock;
char const *default_linuxgpio;
int allow_subshells;
LISTID string_list;
LISTID number_list;
PROGRAMMER * current_prog;
AVRPART * current_part;
AVRMEM * current_mem;
int current_strct;
LISTID part_list;
LISTID programmers;
bool is_alias;
LISTID string_list;
LISTID number_list;
PROGRAMMER *current_prog;
AVRPART *current_part;
AVRMEM *current_mem;
int current_strct;
LISTID part_list;
LISTID programmers;
bool is_alias;
int cfg_lineno;
char * cfg_infile;
int cfg_lineno;
char *cfg_infile;
extern char * yytext;
extern char *yytext;
#define pgm_comp_desc(x, type) { #x, COMP_PROGRAMMER, offsetof(PROGRAMMER, x), sizeof(((PROGRAMMER *) NULL)->x), type }
#define part_comp_desc(x, type) { #x, COMP_AVRPART, offsetof(AVRPART, x), sizeof(((AVRPART *) NULL)->x), type }
@@ -228,8 +228,7 @@ int yywrap()
}
int yyerror(char * errmsg, ...)
{
int yyerror(char *errmsg, ...) {
va_list args;
char message[512];
@@ -245,8 +244,7 @@ int yyerror(char * errmsg, ...)
}
int yywarning(char * errmsg, ...)
{
int yywarning(char *errmsg, ...) {
va_list args;
char message[512];
@@ -262,15 +260,14 @@ int yywarning(char * errmsg, ...)
}
TOKEN * new_token(int primary) {
TOKEN * tkn = (TOKEN *) mmt_malloc(sizeof(TOKEN));
TOKEN *new_token(int primary) {
TOKEN *tkn = (TOKEN *) mmt_malloc(sizeof(TOKEN));
tkn->primary = primary;
return tkn;
}
void free_token(TOKEN * tkn)
{
void free_token(TOKEN *tkn) {
if (tkn) {
switch (tkn->value.type) {
case V_STR:
@@ -287,7 +284,7 @@ void free_token(TOKEN * tkn)
void free_tokens(int n, ...)
{
TOKEN * t;
TOKEN *t;
va_list ap;
va_start(ap, n);
@@ -302,7 +299,7 @@ void free_tokens(int n, ...)
TOKEN *new_number(const char *text) {
const char *errstr;
struct token_t *tkn = new_token(TKN_NUMBER);
TOKEN *tkn = new_token(TKN_NUMBER);
tkn->value.type = V_NUM;
tkn->value.number = str_int(text, STR_INT32, &errstr);
if(errstr) {
@@ -320,7 +317,7 @@ TOKEN *new_number(const char *text) {
TOKEN *new_number_real(const char *text) {
char *endptr;
struct token_t * tkn = new_token(TKN_NUMBER);
TOKEN *tkn = new_token(TKN_NUMBER);
tkn->value.type = V_NUM_REAL;
tkn->value.number_real = strtod(text, &endptr);
if(endptr == text || *endptr) {
@@ -337,7 +334,7 @@ TOKEN *new_number_real(const char *text) {
}
TOKEN *new_constant(const char *con) {
struct token_t *tkn = new_token(TKN_NUMBER);
TOKEN *tkn = new_token(TKN_NUMBER);
int assigned = 1;
tkn->value.type = V_NUM;
@@ -380,7 +377,7 @@ TOKEN *new_constant(const char *con) {
}
TOKEN *new_string(const char *text) {
struct token_t *tkn = new_token(TKN_STRING);
TOKEN *tkn = new_token(TKN_STRING);
tkn->value.type = V_STR;
tkn->value.string = mmt_strdup(text);
@@ -397,8 +394,7 @@ TOKEN *new_keyword(int primary) {
}
void print_token(TOKEN * tkn)
{
void print_token(TOKEN *tkn) {
if (!tkn)
return;
@@ -438,9 +434,8 @@ void pyytext(void)
extern int yylex_destroy(void);
#endif
int read_config(const char * file)
{
FILE * f;
int read_config(const char *file) {
FILE *f;
int r;
if(!(cfg_infile = realpath(file, NULL))) {

32
src/config.h
View File

@@ -74,33 +74,33 @@ enum { // Value types for VALUE struct
};
typedef struct value_t {
int type;
int type;
union {
int number;
double number_real;
char * string;
int number;
double number_real;
char *string;
Component_t *comp;
};
} VALUE;
typedef struct token_t {
typedef struct token {
int primary;
VALUE value;
} TOKEN;
typedef struct token_t *token_p;
typedef struct token *token_p;
extern FILE * yyin;
extern PROGRAMMER * current_prog;
extern AVRPART * current_part;
extern AVRMEM * current_mem;
extern int current_strct;
extern int cfg_lineno;
extern char * cfg_infile;
extern LISTID string_list;
extern LISTID number_list;
extern bool is_alias; // current entry is alias
extern FILE *yyin;
extern PROGRAMMER *current_prog;
extern AVRPART *current_part;
extern AVRMEM *current_mem;
extern int current_strct;
extern int cfg_lineno;
extern char *cfg_infile;
extern LISTID string_list;
extern LISTID number_list;
extern bool is_alias; // current entry is alias
#if !defined(HAS_YYSTYPE)