acars_aircrafts*: Convert aircraft rows from array to struct

This commit is contained in:
Tomas Suchan 2012-07-18 03:05:34 +02:00
parent 98451c2315
commit f7ef9558b3
3 changed files with 28 additions and 12 deletions

View file

@ -1,4 +1,11 @@
const char * acars_aircrafts[][4]={
struct acars_aircraft {
char *reg;
char *carrier_icao;
char *type;
char *cn;
};
const struct acars_aircraft acars_aircrafts[]={
{"0001", "---", "Airbus A319CJ", "1468"},
{"00355S", "USM", "Boeing KC-135R", "18130"},
{"01", "USM", "Gulfstream C-37", "653"},

View file

@ -1,4 +1,13 @@
const char * acars_aircrafts_dot[][4]={
#if 0
struct acars_aircraft {
char *reg;
char *carrier_icao;
char *type;
char *cn;
};
#endif
const struct acars_aircraft acars_aircrafts_dot[]={
{".0001", "---", "Airbus A319CJ", "1468"},
{".00355S", "USM", "Boeing KC-135R", "18130"},
{".01", "USM", "Gulfstream C-37", "653"},

20
main.c
View file

@ -68,22 +68,22 @@ void print_mesg(msg_t * msg)
printf("Aircraft reg: %s, ", msg->addr);
printf("flight id: %s\n", msg->fid);
i=0;
while(acars_aircrafts[i][0]){
if(!strcmp(acars_aircrafts[i][0],(const char*)msg->addr)){
printf("Aircraft type: %s, ",acars_aircrafts[i][2]);
printf("carrier: %s, ",acars_aircrafts[i][1]);
printf("cn: %s\n",acars_aircrafts[i][3]);
while(acars_aircrafts[i].reg){
if(!strcmp(acars_aircrafts[i].reg,(const char*)msg->addr)){
printf("Aircraft type: %s, ",acars_aircrafts[i].type);
printf("carrier: %s, ",acars_aircrafts[i].carrier_icao);
printf("cn: %s\n",acars_aircrafts[i].cn);
break;
}
i++;
}
i=0;
while(acars_aircrafts_dot[i][0]){
if(!strcmp(acars_aircrafts_dot[i][0],(const char*)msg->addr)){
printf("Aircraft type: %s, ",acars_aircrafts_dot[i][2]);
printf("carrier: %s, ",acars_aircrafts_dot[i][1]);
printf("cn: %s\n",acars_aircrafts_dot[i][3]);
while(acars_aircrafts_dot[i].reg){
if(!strcmp(acars_aircrafts_dot[i].reg,(const char*)msg->addr)){
printf("Aircraft type: %s, ",acars_aircrafts_dot[i].type);
printf("carrier: %s, ",acars_aircrafts_dot[i].carrier_icao);
printf("cn: %s\n",acars_aircrafts_dot[i].cn);
break;
}
i++;