summaryrefslogtreecommitdiffstats
path: root/port.cpp
diff options
context:
space:
mode:
authorAndreas Eversberg2010-03-11 14:07:20 +0100
committerAndreas Eversberg2010-03-11 14:07:20 +0100
commit0c65074b5b88b2da2390078d0fab6c72f228709d (patch)
tree297bc8a552f3dde8cdc96f8a2a40f6c8916444ed /port.cpp
parentregister_fd() bugfix. (diff)
downloadlcr-0c65074b5b88b2da2390078d0fab6c72f228709d.tar.gz
lcr-0c65074b5b88b2da2390078d0fab6c72f228709d.tar.xz
lcr-0c65074b5b88b2da2390078d0fab6c72f228709d.zip
Fixed compiler warnings when compiling with gcc 4.3.4.
Fixed names of moved include files (OpenBSC). modified: Makefile.am modified: Makefile.in modified: README modified: chan_lcr.c modified: configure modified: configure.ac modified: genrc.c modified: gentones.c modified: genwave.c modified: gsm.cpp modified: mISDN.cpp modified: main.c modified: port.cpp modified: tones.c modified: trace.c
Diffstat (limited to 'port.cpp')
-rw-r--r--port.cpp25
1 files changed, 14 insertions, 11 deletions
diff --git a/port.cpp b/port.cpp
index e88175b..a083fa2 100644
--- a/port.cpp
+++ b/port.cpp
@@ -647,6 +647,7 @@ int Port::open_record(int type, int vbox, int skip, char *extension, int anon_ig
char filename[256];
time_t now;
struct tm *now_tm;
+ int ret;
if (!extension) {
PERROR("Port(%d) not an extension\n", p_serial);
@@ -711,7 +712,7 @@ int Port::open_record(int type, int vbox, int skip, char *extension, int anon_ig
case CODEC_MONO:
case CODEC_STEREO:
case CODEC_8BIT:
- fwrite(dummyheader, sizeof(dummyheader), 1, p_record);
+ ret = fwrite(dummyheader, sizeof(dummyheader), 1, p_record);
break;
case CODEC_LAW:
@@ -739,6 +740,7 @@ void Port::close_record(int beep, int mute)
char *p;
struct caller_info callerinfo;
const char *valid_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-!$%&/()=+*;~";
+ int ret;
if (!p_record)
return;
@@ -801,7 +803,7 @@ void Port::close_record(int beep, int mute)
}
i = 0;
while(i < beep) {
- fwrite(beep_mono, sizeof(beep_mono), 1, p_record);
+ ret = fwrite(beep_mono, sizeof(beep_mono), 1, p_record);
i += sizeof(beep_mono);
p_record_length += sizeof(beep_mono);
}
@@ -861,7 +863,7 @@ void Port::close_record(int beep, int mute)
fmt.bits_sample = 8; /* one channel */
break;
}
- fwrite(&fmt, sizeof(fmt), 1, p_record);
+ ret = fwrite(&fmt, sizeof(fmt), 1, p_record);
/* data */
fprintf(p_record, "data%c%c%c%c", (unsigned char)(size&0xff), (unsigned char)((size>>8)&0xff), (unsigned char)((size>>16)&0xff), (unsigned char)(size>>24));
@@ -939,6 +941,7 @@ void Port::record(unsigned char *data, int length, int dir_fromup)
signed short *s;
int free, i, ii;
signed int sample;
+ int ret;
/* no recording */
if (!p_record || !length)
@@ -988,7 +991,7 @@ same_again:
p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
i++;
}
- fwrite(write_buffer, 512, 1, p_record);
+ ret = fwrite(write_buffer, 512, 1, p_record);
p_record_length += 512;
break;
@@ -1011,7 +1014,7 @@ same_again:
i++;
}
}
- fwrite(write_buffer, 1024, 1, p_record);
+ ret = fwrite(write_buffer, 1024, 1, p_record);
p_record_length += 1024;
break;
@@ -1023,7 +1026,7 @@ same_again:
p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
i++;
}
- fwrite(write_buffer, 512, 1, p_record);
+ ret = fwrite(write_buffer, 512, 1, p_record);
p_record_length += 512;
break;
@@ -1035,7 +1038,7 @@ same_again:
p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
i++;
}
- fwrite(write_buffer, 256, 1, p_record);
+ ret = fwrite(write_buffer, 256, 1, p_record);
p_record_length += 256;
break;
}
@@ -1075,7 +1078,7 @@ different_again:
*s++ = sample;
i++;
}
- fwrite(write_buffer, ii<<1, 1, p_record);
+ ret = fwrite(write_buffer, ii<<1, 1, p_record);
p_record_length += (ii<<1);
break;
@@ -1098,7 +1101,7 @@ different_again:
i++;
}
}
- fwrite(write_buffer, ii<<2, 1, p_record);
+ ret = fwrite(write_buffer, ii<<2, 1, p_record);
p_record_length += (ii<<2);
break;
@@ -1114,7 +1117,7 @@ different_again:
*d++ = (sample+0x8000) >> 8;
i++;
}
- fwrite(write_buffer, ii, 1, p_record);
+ ret = fwrite(write_buffer, ii, 1, p_record);
p_record_length += ii;
break;
@@ -1130,7 +1133,7 @@ different_again:
*d++ = audio_s16_to_law[sample & 0xffff];
i++;
}
- fwrite(write_buffer, ii, 1, p_record);
+ ret = fwrite(write_buffer, ii, 1, p_record);
p_record_length += ii;
break;
}