Added and fixed extra compiler warnings

This commit is contained in:
Andreas Eversberg
2016-10-07 08:55:18 +02:00
parent 8ef966aa21
commit 27938d111e
31 changed files with 90 additions and 89 deletions

View File

@@ -1,4 +1,4 @@
AM_CPPFLAGS = -Wall -g $(all_includes)
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
bin_PROGRAMS = \
cnetz

View File

@@ -455,7 +455,7 @@ cnetz_t *search_ogk(void)
return NULL;
}
int call_out_setup(int callref, const char *caller_id, enum number_type caller_type, const char *dialing)
int call_out_setup(int callref, const char __attribute__((unused)) *caller_id, enum number_type __attribute__((unused)) caller_type, const char *dialing)
{
sender_t *sender;
cnetz_t *cnetz;
@@ -784,13 +784,13 @@ void cnetz_sync_frame(cnetz_t *cnetz, double sync, int block)
/* if more than +- one bit out of sync */
if (offset < -0.5 || offset > 0.5) {
PDEBUG(DCNETZ, DEBUG_NOTICE, "Frame sync offset = %.2f, correcting!\n", offset);
fsk_correct_sync(cnetz, offset);
fsk_correct_sync(&cnetz->fsk_demod, offset);
return;
}
/* resync by some fraction of received sync error */
PDEBUG(DCNETZ, DEBUG_DEBUG, "Frame sync offset = %.2f, correcting.\n", offset);
fsk_correct_sync(cnetz, offset / 2.0);
fsk_correct_sync(&cnetz->fsk_demod, offset / 2.0);
}
/*

View File

@@ -84,7 +84,7 @@ static void db_timeout(struct timer *timer)
}
/* create/update db entry */
int update_db(cnetz_t *cnetz, uint8_t futln_nat, uint8_t futln_fuvst, uint16_t futln_rest, int extended, int busy, int failed)
int update_db(cnetz_t __attribute__((unused)) *cnetz, uint8_t futln_nat, uint8_t futln_fuvst, uint16_t futln_rest, int extended, int busy, int failed)
{
cnetz_db_t *db, **dbp;

View File

@@ -142,7 +142,7 @@ int fsk_fm_init(fsk_fm_demod_t *fsk, cnetz_t *cnetz, int samplerate, double bitr
len = (int)((double)samplerate / bitrate + 0.5);
half = (int)((double)samplerate / bitrate / 2.0 + 0.5);
if (len > sizeof(fsk->bit_buffer_spl) / sizeof(fsk->bit_buffer_spl[0])) {
if (len > (int)(sizeof(fsk->bit_buffer_spl) / sizeof(fsk->bit_buffer_spl[0]))) {
PDEBUG(DDSP, DEBUG_ERROR, "Sample rate too high for buffer, please use lower rate, like 192000 Hz!\n");
return -1;
}
@@ -496,9 +496,10 @@ void fsk_fm_demod(fsk_fm_demod_t *fsk, int16_t *samples, int length)
fsk->bit_count = bit_count;
}
void fsk_correct_sync(cnetz_t *cnetz, double offset)
void fsk_correct_sync(fsk_fm_demod_t *fsk, double offset)
{
bit_time = fmod(bit_time - offset + BITS_PER_SUPERFRAME, BITS_PER_SUPERFRAME);
fsk->bit_time = bit_time;
}
void fsk_demod_reset(fsk_fm_demod_t *fsk)

View File

@@ -52,6 +52,6 @@ typedef struct fsk_fm_demod {
int fsk_fm_init(fsk_fm_demod_t *fsk, cnetz_t *cnetz, int samplerate, double bitrate);
void fsk_fm_demod(fsk_fm_demod_t *fsk, int16_t *samples, int length);
void fsk_correct_sync(cnetz_t *cnetz, double offset);
void fsk_correct_sync(fsk_fm_demod_t *fsk, double offset);
void fsk_demod_reset(fsk_fm_demod_t *fsk);

View File

@@ -44,7 +44,7 @@ void print_image(void)
int i, j;
for (i = 0; image[i]; i++) {
for (j = 0; j < strlen(image[i]); j++) {
for (j = 0; j < (int)strlen(image[i]); j++) {
if (image[i][j] == '@') {
j++;
switch(image[i][j]) {