Whitespace cleanups

This commit is contained in:
Oliver Jowett 2018-01-09 17:13:34 +00:00
parent daebc372a9
commit 44e8913c2d
5 changed files with 12 additions and 12 deletions

View file

@ -371,7 +371,7 @@ void backgroundTasks(void) {
trackPeriodicUpdate(); trackPeriodicUpdate();
if (Modes.net) { if (Modes.net) {
modesNetPeriodicWork(); modesNetPeriodicWork();
} }

View file

@ -716,7 +716,7 @@ static void decodeESIdentAndCategory(struct modesMessage *mm)
mm->callsign[6] = ais_charset[getbits(me, 45, 50)]; mm->callsign[6] = ais_charset[getbits(me, 45, 50)];
mm->callsign[7] = ais_charset[getbits(me, 51, 56)]; mm->callsign[7] = ais_charset[getbits(me, 51, 56)];
mm->callsign[8] = 0; mm->callsign[8] = 0;
// A common failure mode seems to be to intermittently send // A common failure mode seems to be to intermittently send
// all zeros. Catch that here. // all zeros. Catch that here.
mm->callsign_valid = (strcmp(mm->callsign, "@@@@@@@@") != 0); mm->callsign_valid = (strcmp(mm->callsign, "@@@@@@@@") != 0);

View file

@ -1761,7 +1761,7 @@ __attribute__ ((format (printf,3,0))) static char *safe_vsnprintf(char *p, char
p += vsnprintf(p < end ? p : NULL, p < end ? (size_t)(end - p) : 0, format, ap); p += vsnprintf(p < end ? p : NULL, p < end ? (size_t)(end - p) : 0, format, ap);
return p; return p;
} }
__attribute__ ((format (printf,3,4))) static char *safe_snprintf(char *p, char *end, const char *format, ...) __attribute__ ((format (printf,3,4))) static char *safe_snprintf(char *p, char *end, const char *format, ...)
{ {
va_list ap; va_list ap;
@ -1771,7 +1771,7 @@ __attribute__ ((format (printf,3,0))) static char *safe_vsnprintf(char *p, char
return p; return p;
} }
__attribute__ ((format (printf,4,5))) static char *appendFATSV(char *p, char *end, const char *field, const char *format, ...) __attribute__ ((format (printf,4,5))) static char *appendFATSV(char *p, char *end, const char *field, const char *format, ...)
{ {
va_list ap; va_list ap;
@ -1780,8 +1780,8 @@ __attribute__ ((format (printf,4,5))) static char *appendFATSV(char *p, char *en
p = safe_snprintf(p, end, "%s\t", field); p = safe_snprintf(p, end, "%s\t", field);
p = safe_vsnprintf(p, end, format, ap); p = safe_vsnprintf(p, end, format, ap);
p = safe_snprintf(p, end, "\t"); p = safe_snprintf(p, end, "\t");
va_end(ap); va_end(ap);
return p; return p;
} }
@ -1957,17 +1957,17 @@ static inline float heading_difference(float h1, float h2)
// expired data // expired data
return p; return p;
} }
if (source->updated > messageNow()) { if (source->updated > messageNow()) {
// data in the future // data in the future
return p; return p;
} }
if (source->updated < a->fatsv_last_emitted) { if (source->updated < a->fatsv_last_emitted) {
// not updated since last time // not updated since last time
return p; return p;
} }
uint64_t age = (messageNow() - source->updated) / 1000; uint64_t age = (messageNow() - source->updated) / 1000;
if (age > 255) { if (age > 255) {
// too old // too old
@ -2075,7 +2075,7 @@ static void writeFATSV()
// some special cases: // some special cases:
int altValid = trackDataValid(&a->altitude_baro_valid); int altValid = trackDataValid(&a->altitude_baro_valid);
int airgroundValid = trackDataValid(&a->airground_valid) && a->airground_valid.source >= SOURCE_MODE_S_CHECKED; // for non-ADS-B transponders, only trust DF11 CA field int airgroundValid = trackDataValid(&a->airground_valid) && a->airground_valid.source >= SOURCE_MODE_S_CHECKED; // for non-ADS-B transponders, only trust DF11 CA field
int gsValid = trackDataValid(&a->gs_valid); int gsValid = trackDataValid(&a->gs_valid);
int squawkValid = trackDataValid(&a->squawk_valid); int squawkValid = trackDataValid(&a->squawk_valid);
int callsignValid = trackDataValid(&a->callsign_valid) && strcmp(a->callsign, " ") != 0; int callsignValid = trackDataValid(&a->callsign_valid) && strcmp(a->callsign, " ") != 0;

View file

@ -815,7 +815,7 @@ struct aircraft *trackUpdateFromMessage(struct modesMessage *mm)
} }
_messageNow = mm->sysTimestampMsg; _messageNow = mm->sysTimestampMsg;
// Lookup our aircraft or create a new one // Lookup our aircraft or create a new one
a = trackFindAircraft(mm->addr); a = trackFindAircraft(mm->addr);
if (!a) { // If it's a currently unknown aircraft.... if (!a) { // If it's a currently unknown aircraft....

View file

@ -73,7 +73,7 @@
// expired: data is not valid. // expired: data is not valid.
typedef struct { typedef struct {
uint64_t stale_interval; /* how long after an update until the data is stale */ uint64_t stale_interval; /* how long after an update until the data is stale */
uint64_t expire_interval; /* how long after an update until the data expires */ uint64_t expire_interval; /* how long after an update until the data expires */
datasource_t source; /* where the data came from */ datasource_t source; /* where the data came from */
uint64_t updated; /* when it arrived */ uint64_t updated; /* when it arrived */