summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ce460a9)
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
15 files changed:
-GSM_INCLUDE = -DWITH_GSM -I./openbsc/include
+GSM_INCLUDE = -DWITH_GSM -I./openbsc/include -I./libosmocore/include
GSM_SOURCE = gsm_audio.c gsm.cpp gsm_conf.c openbsc/src/bsc_init.c openbsc/src/vty_interface.c openbsc/src/vty_interface_layer3.c
GSM_SOURCE = gsm_audio.c gsm.cpp gsm_conf.c openbsc/src/bsc_init.c openbsc/src/vty_interface.c openbsc/src/vty_interface_layer3.c
-GSM_LIB = /usr/lib/libgsm.a ./openbsc/src/libbsc.a ./openbsc/src/libmsc.a ./openbsc/src/libvty.a -ldbi -lcrypt
+GSM_LIB = /usr/lib/libgsm.a ./openbsc/src/libbsc.a ./openbsc/src/libmsc.a ./openbsc/src/libvty.a -L./libosmocore/src/ -losmocore -ldbi -lcrypt
#gsm_audio.po: gsm_audio.c gsm_audio.h
# $(CC) -D_GNU_SOURCE -fPIC -c gsm_audio.c -o gsm_audio.po
#gsm_audio.po: gsm_audio.c gsm_audio.h
# $(CC) -D_GNU_SOURCE -fPIC -c gsm_audio.c -o gsm_audio.po
-DLOG_DIR="\"$(LOGdir)\"" \
-DEXTENSION_DATA="\"$(EXTENSIONdir)\""
-DLOG_DIR="\"$(LOGdir)\"" \
-DEXTENSION_DATA="\"$(EXTENSIONdir)\""
-@ENABLE_GSM_TRUE@GSM_INCLUDE = -DWITH_GSM -I./openbsc/include
+@ENABLE_GSM_TRUE@GSM_INCLUDE = -DWITH_GSM -I./openbsc/include -I./libosmocore/include
@ENABLE_GSM_TRUE@GSM_SOURCE = gsm_audio.c gsm.cpp gsm_conf.c openbsc/src/bsc_init.c openbsc/src/vty_interface.c openbsc/src/vty_interface_layer3.c
@ENABLE_GSM_TRUE@GSM_SOURCE = gsm_audio.c gsm.cpp gsm_conf.c openbsc/src/bsc_init.c openbsc/src/vty_interface.c openbsc/src/vty_interface_layer3.c
-@ENABLE_GSM_TRUE@GSM_LIB = /usr/lib/libgsm.a ./openbsc/src/libbsc.a ./openbsc/src/libmsc.a ./openbsc/src/libvty.a -ldbi -lcrypt
+@ENABLE_GSM_TRUE@GSM_LIB = /usr/lib/libgsm.a ./openbsc/src/libbsc.a ./openbsc/src/libmsc.a ./openbsc/src/libvty.a -L./libosmocore/src/ -losmocore -ldbi -lcrypt
#gsm_audio.po: gsm_audio.c gsm_audio.h
# $(CC) -D_GNU_SOURCE -fPIC -c gsm_audio.c -o gsm_audio.po
#gsm_audio.po: gsm_audio.c gsm_audio.h
# $(CC) -D_GNU_SOURCE -fPIC -c gsm_audio.c -o gsm_audio.po
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
- cd $(srcdir) && $(AUTOMAKE) --foreign \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+ cd $(srcdir) && $(AUTOMAKE) --gnu \
&& exit 0; \
exit 1;; \
esac; \
done; \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
- $(AUTOMAKE) --foreign Makefile
+ $(AUTOMAKE) --gnu Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-> Use options "t:q250" for disabling mISDN_dsp and adding a 250ms delay.
- Fixed HLC (higher layer capability) modification to LCR routing.
- Fixed chan_lcr fax queue buffer. Added LCR_TRANSFERCAPABILITY environment.
-> Use options "t:q250" for disabling mISDN_dsp and adding a 250ms delay.
- Fixed HLC (higher layer capability) modification to LCR routing.
- Fixed chan_lcr fax queue buffer. Added LCR_TRANSFERCAPABILITY environment.
+- Fixed compiler warnings when compiling with gcc 4.3.4.
+
+
break;
#ifdef AST_CONTROL_SRCUPDATE
case AST_CONTROL_SRCUPDATE:
break;
#ifdef AST_CONTROL_SRCUPDATE
case AST_CONTROL_SRCUPDATE:
+#else
+ case 20:
+#endif
CDEBUG(call, ast, "Received AST_CONTROL_SRCUPDATE from Asterisk.\n");
break;
CDEBUG(call, ast, "Received AST_CONTROL_SRCUPDATE from Asterisk.\n");
break;
default:
CERROR(call, ast, "Received indicate from Asterisk with unknown condition %d.\n", cond);
res = -1;
default:
CERROR(call, ast, "Received indicate from Asterisk with unknown condition %d.\n", cond);
res = -1;
if test "x$with_gsm" != xcheck ; then
{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
if test "x$with_gsm" != xcheck ; then
{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: --with-gsm was given, but openbsc/include/openbsc/gsm_data.h was not found! Pleas link OpenBSC source directory to LCR source directory: ln -s path_to_openbsc/openbsc/ .
+{ { $as_echo "$as_me:$LINENO: error: --with-gsm was given, but openbsc/include/openbsc/gsm_data.h was not found! Pleas link OpenBSC and libosmocore source directory to LCR source directory: ln -s path_to_openbsc/openbsc/ openbsc ; ln -s patch_to_libosmocore osmocore
See \`config.log' for more details." >&5
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: --with-gsm was given, but openbsc/include/openbsc/gsm_data.h was not found! Pleas link OpenBSC source directory to LCR source directory: ln -s path_to_openbsc/openbsc/ .
+$as_echo "$as_me: error: --with-gsm was given, but openbsc/include/openbsc/gsm_data.h was not found! Pleas link OpenBSC and libosmocore source directory to LCR source directory: ln -s path_to_openbsc/openbsc/ openbsc ; ln -s patch_to_libosmocore osmocore
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }; }
fi
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }; }
fi
[with_gsm="yes"],
[if test "x$with_gsm" != xcheck ; then
AC_MSG_FAILURE(
[with_gsm="yes"],
[if test "x$with_gsm" != xcheck ; then
AC_MSG_FAILURE(
- [--with-gsm was given, but openbsc/include/openbsc/gsm_data.h was not found! Pleas link OpenBSC source directory to LCR source directory: ln -s path_to_openbsc/openbsc/ .])
+ [--with-gsm was given, but openbsc/include/openbsc/gsm_data.h was not found! Pleas link OpenBSC and libosmocore source directory to LCR source directory: ln -s path_to_openbsc/openbsc/ openbsc ; ln -s patch_to_libosmocore osmocore])
FILE *fp;
int i = 0, j, jj, n;
char input[256], file[256];
FILE *fp;
int i = 0, j, jj, n;
char input[256], file[256];
printf("\n\nThis program generates a script, which is used to start/stop/restart mISDN\n");
printf("driver. Please select card only once. Mode and options are given by LCR.\n");
printf("\n\nThis program generates a script, which is used to start/stop/restart mISDN\n");
printf("driver. Please select card only once. Mode and options are given by LCR.\n");
}
do {
printf("\nSelect driver number[1-n] (or enter 'done'): "); fflush(stdout);
}
do {
printf("\nSelect driver number[1-n] (or enter 'done'): "); fflush(stdout);
+ ret = scanf("%s", input);
} while (atoi(input) <= 0 && !!strcmp(input, "done"));
type[i] = atoi(input);
i++;
} while (atoi(input) <= 0 && !!strcmp(input, "done"));
type[i] = atoi(input);
i++;
}
printf("\nEnter LAW audio mode. For a-LAW (default), just enter 0. For u-LAW enter 1.\n[0..n | 0xn]: "); fflush(stdout);
}
printf("\nEnter LAW audio mode. For a-LAW (default), just enter 0. For u-LAW enter 1.\n[0..n | 0xn]: "); fflush(stdout);
+ ret = scanf("%s", input);
lawopt = strtoul(input, NULL, 0);
printf("\nEnter debugging flags of mISDN core. For no debug, just enter 0.\n[0..n | 0xn]: "); fflush(stdout);
lawopt = strtoul(input, NULL, 0);
printf("\nEnter debugging flags of mISDN core. For no debug, just enter 0.\n[0..n | 0xn]: "); fflush(stdout);
+ ret = scanf("%s", input);
coredebug = strtoul(input, NULL, 0);
printf("\nEnter debugging flags of cards. For no debug, just enter 0.\n[0..n | 0xn]: "); fflush(stdout);
coredebug = strtoul(input, NULL, 0);
printf("\nEnter debugging flags of cards. For no debug, just enter 0.\n[0..n | 0xn]: "); fflush(stdout);
+ ret = scanf("%s", input);
carddebug = strtoul(input, NULL, 0);
printf("\nEnter dsp debugging flags of driver. For no debug, just enter 0.\n[0..n | 0xn]: "); fflush(stdout);
carddebug = strtoul(input, NULL, 0);
printf("\nEnter dsp debugging flags of driver. For no debug, just enter 0.\n[0..n | 0xn]: "); fflush(stdout);
+ ret = scanf("%s", input);
dspdebug = strtoul(input, NULL, 0);
n = i;
printf("\nWhere do you like to load the modules from, enter 0 for default, 1 for\n'/usr/local/lcr/modules/' or the full path.\n[0 | 1 | <path>]: "); fflush(stdout);
dspdebug = strtoul(input, NULL, 0);
n = i;
printf("\nWhere do you like to load the modules from, enter 0 for default, 1 for\n'/usr/local/lcr/modules/' or the full path.\n[0 | 1 | <path>]: "); fflush(stdout);
+ ret = scanf("%s", input);
if (!strcmp(input, "0"))
SCPY(input, "");
if (!strcmp(input, "1"))
if (!strcmp(input, "0"))
SCPY(input, "");
if (!strcmp(input, "1"))
SCAT(input, "/");
printf("\n\nFinally tell me where to write the mISDN rc file.\nEnter the name 'mISDN' for current directory.\nYou may want to say '/usr/local/lcr/mISDN' or '/etc/rc.d/mISDN'\n: "); fflush(stdout);
SCAT(input, "/");
printf("\n\nFinally tell me where to write the mISDN rc file.\nEnter the name 'mISDN' for current directory.\nYou may want to say '/usr/local/lcr/mISDN' or '/etc/rc.d/mISDN'\n: "); fflush(stdout);
+ ret = scanf("%s", file);
if (!(fp=fopen(file, "w"))) {
fprintf(stderr, "\nError: Failed to open '%s', try again.\n", file);
exit(EXIT_FAILURE);
if (!(fp=fopen(file, "w"))) {
fprintf(stderr, "\nError: Failed to open '%s', try again.\n", file);
exit(EXIT_FAILURE);
short sample, sample2;
signed int size, chunk;
int gotfmt = 0, gotdata = 0;
short sample, sample2;
signed int size, chunk;
int gotfmt = 0, gotdata = 0;
if ((wfp=fopen(wav,"r"))) {
if ((wfp=fopen(wav,"r"))) {
+ ret=fread(buffer,8,1,wfp);
size=(buffer[4]) + (buffer[5]<<8) + (buffer[6]<<16) + (buffer[7]<<24);
if (!!strncmp((char *)buffer, "RIFF", 4)) {
fclose(wfp);
size=(buffer[4]) + (buffer[5]<<8) + (buffer[6]<<16) + (buffer[7]<<24);
if (!!strncmp((char *)buffer, "RIFF", 4)) {
fclose(wfp);
return;
}
printf("%c%c%c%c size=%d\n",buffer[0],buffer[1],buffer[2],buffer[3],size);
return;
}
printf("%c%c%c%c size=%d\n",buffer[0],buffer[1],buffer[2],buffer[3],size);
+ ret=fread(buffer,4,1,wfp);
size -= 4;
if (!!strncmp((char *)buffer, "WAVE", 4)) {
fclose(wfp);
size -= 4;
if (!!strncmp((char *)buffer, "WAVE", 4)) {
fclose(wfp);
fprintf(stderr, "Error: Remaining file size %d not large enough for next chunk.\n",size);
return;
}
fprintf(stderr, "Error: Remaining file size %d not large enough for next chunk.\n",size);
return;
}
+ ret=fread(buffer,8,1,wfp);
chunk=(buffer[4]) + (buffer[5]<<8) + (buffer[6]<<16) + (buffer[7]<<24);
//printf("DEBUG: size(%d) - (8+chunk(%d) = size(%d)\n", size, chunk, size-chunk-8);
size -= (8+chunk);
chunk=(buffer[4]) + (buffer[5]<<8) + (buffer[6]<<16) + (buffer[7]<<24);
//printf("DEBUG: size(%d) - (8+chunk(%d) = size(%d)\n", size, chunk, size-chunk-8);
size -= (8+chunk);
fprintf(stderr, "Error: Fmt chunk illegal size.\n");
return;
}
fprintf(stderr, "Error: Fmt chunk illegal size.\n");
return;
}
- fread(buffer, chunk, 1, wfp);
+ ret=fread(buffer, chunk, 1, wfp);
fmt = (struct fmt *)buffer;
if (fmt->channels<1 || fmt->channels>2) {
fclose(wfp);
fmt = (struct fmt *)buffer;
if (fmt->channels<1 || fmt->channels>2) {
fclose(wfp);
i=0;
if (bytes==2 && channels==1) {
while(i<chunk) {
i=0;
if (bytes==2 && channels==1) {
while(i<chunk) {
- fread(buffer, 2, 1, wfp);
+ ret=fread(buffer, 2, 1, wfp);
sample=(buffer[1]<<8) + (buffer[0]);
fputc(encode_isdn(sample, law),fp);
i+=2;
sample=(buffer[1]<<8) + (buffer[0]);
fputc(encode_isdn(sample, law),fp);
i+=2;
}
if (bytes==2 && channels==2) {
while(i<chunk) {
}
if (bytes==2 && channels==2) {
while(i<chunk) {
- fread(buffer, 4, 1, wfp);
+ ret=fread(buffer, 4, 1, wfp);
sample=(buffer[1]<<8) + (buffer[0]);
sample2=(buffer[3]<<8) + (buffer[2]);
sample = (sample/2) + (sample2/2);
sample=(buffer[1]<<8) + (buffer[0]);
sample2=(buffer[3]<<8) + (buffer[2]);
sample = (sample/2) + (sample2/2);
}
if (bytes==1 && channels==1) {
while(i<chunk) {
}
if (bytes==1 && channels==1) {
while(i<chunk) {
- fread(buffer, 1, 1, wfp);
+ ret=fread(buffer, 1, 1, wfp);
sample=(buffer[0]<<8);
fputc(encode_isdn(sample, law),fp);
i+=1;
sample=(buffer[0]<<8);
fputc(encode_isdn(sample, law),fp);
i+=1;
}
if (bytes==1 && channels==2) {
while(i<chunk) {
}
if (bytes==1 && channels==2) {
while(i<chunk) {
- fread(buffer, 2, 1, wfp);
+ ret=fread(buffer, 2, 1, wfp);
sample=(buffer[0]<<8);
sample2=(buffer[1]<<8);
sample = (sample/2) + (sample2/2);
sample=(buffer[0]<<8);
sample2=(buffer[1]<<8);
sample = (sample/2) + (sample2/2);
} else {
printf("Ignoring chunk '%c%c%c%c' (length=%d)\n",buffer[0],buffer[1],buffer[2],buffer[3], chunk);
while(chunk > (signed int)sizeof(buffer)) {
} else {
printf("Ignoring chunk '%c%c%c%c' (length=%d)\n",buffer[0],buffer[1],buffer[2],buffer[3], chunk);
while(chunk > (signed int)sizeof(buffer)) {
- fread(buffer, sizeof(buffer), 1, wfp);
+ ret=fread(buffer, sizeof(buffer), 1, wfp);
chunk -= sizeof(buffer);
}
if (chunk)
chunk -= sizeof(buffer);
}
if (chunk)
- fread(buffer, chunk, 1, wfp);
+ ret=fread(buffer, chunk, 1, wfp);
unsigned int i;
short sample;
unsigned int size, wsize;
unsigned int i;
short sample;
unsigned int size, wsize;
if ((lfp=fopen(name,"r"))) {
/* get size */
if ((lfp=fopen(name,"r"))) {
/* get size */
fmt.data_rate = 16000;
fmt.bytes_sample = 2;
fmt.bits_sample = 16;
fmt.data_rate = 16000;
fmt.bytes_sample = 2;
fmt.bits_sample = 16;
- fwrite(&fmt, sizeof(fmt), 1, fp);
+ ret = fwrite(&fmt, sizeof(fmt), 1, fp);
/* data */
fprintf(fp, "data%c%c%c%c", (char)(size&0xff), (char)((size>>8)&0xff), (char)((size>>16)&0xff), (char)(size>>24));
i = 0;
while(i < size) {
/* data */
fprintf(fp, "data%c%c%c%c", (char)(size&0xff), (char)((size>>8)&0xff), (char)((size>>16)&0xff), (char)(size>>24));
i = 0;
while(i < size) {
- fread(buffer, 1, 1, lfp);
+ ret = fread(buffer, 1, 1, lfp);
if (law == 'a')
sample = isdn_audio_alaw_to_s16[*buffer];
else
sample = isdn_audio_ulaw_to_s16[*buffer];
if (law == 'a')
sample = isdn_audio_alaw_to_s16[*buffer];
else
sample = isdn_audio_ulaw_to_s16[*buffer];
- fwrite(&sample, 2, 1, fp);
+ ret = fwrite(&sample, 2, 1, fp);
#include <getopt.h>
#include <openbsc/db.h>
#include <getopt.h>
#include <openbsc/db.h>
-#include <openbsc/select.h>
+#include <osmocore/select.h>
#include <openbsc/debug.h>
#include <openbsc/e1_input.h>
#include <openbsc/debug.h>
#include <openbsc/e1_input.h>
-#include <openbsc/talloc.h>
+#include <osmocore/talloc.h>
#include <openbsc/mncc.h>
#include <openbsc/trau_frame.h>
struct gsm_network *bsc_gsmnet = 0;
#include <openbsc/mncc.h>
#include <openbsc/trau_frame.h>
struct gsm_network *bsc_gsmnet = 0;
struct mbuffer *mb;
struct l3_msg *l3m;
char byte;
struct mbuffer *mb;
struct l3_msg *l3m;
char byte;
/* unset global semaphore */
upqueue_avail = 0;
// with a very small incident, upqueue_avail may be set by mISDN thread and
// another byte may be sent to the pipe, which causes a call to this function
// again with nothing in the upqueue. this is no problem.
/* unset global semaphore */
upqueue_avail = 0;
// with a very small incident, upqueue_avail may be set by mISDN thread and
// another byte may be sent to the pipe, which causes a call to this function
// again with nothing in the upqueue. this is no problem.
- read(fd->fd, &byte, 1);
+ ret = read(fd->fd, &byte, 1);
/* process all ports */
mISDNport = mISDNport_first;
/* process all ports */
mISDNport = mISDNport_first;
// this is no problem.
upqueue_avail = 1;
char byte = 0;
// this is no problem.
upqueue_avail = 1;
char byte = 0;
- write(upqueue_pipe[1], &byte, 1);
+ int ret;
+ ret = write(upqueue_pipe[1], &byte, 1);
/* query available isdn ports */
if (!(strcasecmp(argv[1],"query"))) {
/* query available isdn ports */
if (!(strcasecmp(argv[1],"query"))) {
fprintf(stderr, "-> Using 'misdn_info'\n");
fprintf(stderr, "-> Using 'misdn_info'\n");
+ rc = system("misdn_info");
char filename[256];
time_t now;
struct tm *now_tm;
char filename[256];
time_t now;
struct tm *now_tm;
if (!extension) {
PERROR("Port(%d) not an extension\n", p_serial);
if (!extension) {
PERROR("Port(%d) not an extension\n", p_serial);
case CODEC_MONO:
case CODEC_STEREO:
case CODEC_8BIT:
case CODEC_MONO:
case CODEC_STEREO:
case CODEC_8BIT:
- fwrite(dummyheader, sizeof(dummyheader), 1, p_record);
+ ret = fwrite(dummyheader, sizeof(dummyheader), 1, p_record);
char *p;
struct caller_info callerinfo;
const char *valid_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-!$%&/()=+*;~";
char *p;
struct caller_info callerinfo;
const char *valid_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-!$%&/()=+*;~";
}
i = 0;
while(i < beep) {
}
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);
}
i += sizeof(beep_mono);
p_record_length += sizeof(beep_mono);
}
fmt.bits_sample = 8; /* one channel */
break;
}
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));
/* 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));
signed short *s;
int free, i, ii;
signed int sample;
signed short *s;
int free, i, ii;
signed int sample;
/* no recording */
if (!p_record || !length)
/* no recording */
if (!p_record || !length)
p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
i++;
}
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;
p_record_length += 512;
break;
- fwrite(write_buffer, 1024, 1, p_record);
+ ret = fwrite(write_buffer, 1024, 1, p_record);
p_record_length += 1024;
break;
p_record_length += 1024;
break;
p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
i++;
}
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;
p_record_length += 512;
break;
p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
i++;
}
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;
}
p_record_length += 256;
break;
}
- fwrite(write_buffer, ii<<1, 1, p_record);
+ ret = fwrite(write_buffer, ii<<1, 1, p_record);
p_record_length += (ii<<1);
break;
p_record_length += (ii<<1);
break;
- fwrite(write_buffer, ii<<2, 1, p_record);
+ ret = fwrite(write_buffer, ii<<2, 1, p_record);
p_record_length += (ii<<2);
break;
p_record_length += (ii<<2);
break;
*d++ = (sample+0x8000) >> 8;
i++;
}
*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;
p_record_length += ii;
break;
*d++ = audio_s16_to_law[sample & 0xffff];
i++;
}
*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;
}
p_record_length += ii;
break;
}
int linksize;
int l;
char *p;
int linksize;
int l;
char *p;
/* try to open the law file */
/* try to open the law file */
SPRINT(filename, "%s.wav", file);
if ((fh = open(filename, O_RDONLY)) >= 0) {
/* get wave header */
SPRINT(filename, "%s.wav", file);
if ((fh = open(filename, O_RDONLY)) >= 0) {
/* get wave header */
+ ret = read(fh, buffer, 8);
size=(buffer[4]) + (buffer[5]<<8) + (buffer[6]<<16) + (buffer[7]<<24);
if (!!strncmp((char *)buffer, "RIFF", 4)) {
close(fh);
size=(buffer[4]) + (buffer[5]<<8) + (buffer[6]<<16) + (buffer[7]<<24);
if (!!strncmp((char *)buffer, "RIFF", 4)) {
close(fh);
return(-1);
}
// printf("%c%c%c%c size=%ld\n",buffer[0],buffer[1],buffer[2],buffer[3],size);
return(-1);
}
// printf("%c%c%c%c size=%ld\n",buffer[0],buffer[1],buffer[2],buffer[3],size);
+ ret = read(fh, buffer, 4);
size -= 4;
if (!!strncmp((char *)buffer, "WAVE", 4)) {
close(fh);
size -= 4;
if (!!strncmp((char *)buffer, "WAVE", 4)) {
close(fh);
PERROR("Remaining file size %ld not large enough for next chunk.\n",size);
return(-1);
}
PERROR("Remaining file size %ld not large enough for next chunk.\n",size);
return(-1);
}
+ ret = read(fh, buffer, 8);
chunk=(buffer[4]) + (buffer[5]<<8) + (buffer[6]<<16) + (buffer[7]<<24);
size -= (8+chunk);
// printf("%c%c%c%c length=%d\n",buffer[0],buffer[1],buffer[2],buffer[3],chunk);
chunk=(buffer[4]) + (buffer[5]<<8) + (buffer[6]<<16) + (buffer[7]<<24);
size -= (8+chunk);
// printf("%c%c%c%c length=%d\n",buffer[0],buffer[1],buffer[2],buffer[3],chunk);
PERROR("File %s Fmt chunk illegal size.\n", filename);
return(-1);
}
PERROR("File %s Fmt chunk illegal size.\n", filename);
return(-1);
}
- read(fh, buffer, chunk);
+ ret = read(fh, buffer, chunk);
fmt = (struct fmt *)buffer;
if (fmt->channels<1 || fmt->channels>2) {
close(fh);
fmt = (struct fmt *)buffer;
if (fmt->channels<1 || fmt->channels>2) {
close(fh);
} else {
// PDEBUG(DEBUG_PORT, "Unknown chunk '%c%c%c%c'\n",buffer[0],buffer[1],buffer[2],buffer[3]);
while(chunk > sizeof(buffer)) {
} else {
// PDEBUG(DEBUG_PORT, "Unknown chunk '%c%c%c%c'\n",buffer[0],buffer[1],buffer[2],buffer[3]);
while(chunk > sizeof(buffer)) {
- read(fh, buffer, sizeof(buffer));
+ ret = read(fh, buffer, sizeof(buffer));
chunk -= sizeof(buffer);
}
if (chunk)
chunk -= sizeof(buffer);
}
if (chunk)
- read(fh, buffer, chunk);
+ ret = read(fh, buffer, chunk);
FILE *fp;
struct admin_list *admin;
struct admin_queue *response, **responsep; /* response pointer */
FILE *fp;
struct admin_list *admin;
struct admin_queue *response, **responsep; /* response pointer */
if (!trace.name[0])
PERROR("trace not started in file %s line %d\n", __file, __line);
if (!trace.name[0])
PERROR("trace not started in file %s line %d\n", __file, __line);
if (options.log[0]) {
fp = fopen(options.log, "a");
if (fp) {
if (options.log[0]) {
fp = fopen(options.log, "a");
if (fp) {
- fwrite(string, strlen(string), 1, fp);
+ ret = fwrite(string, strlen(string), 1, fp);