[asterisk-commits] russell: branch group/asterisk-cpp r168412 - /team/group/asterisk-cpp/main/

[SVN commits to the Asterisk project]

Author: russell
Date: Sat Jan 10 19:41:23 2009
New Revision: 168412

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168412
Log:
tdd.c builds

Modified:
    team/group/asterisk-cpp/main/Makefile
    team/group/asterisk-cpp/main/tdd.c

Modified: team/group/asterisk-cpp/main/Makefile
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/main/Makefile?view=diff&rev=168412&r1=168411&r2=168412
==============================================================================
--- team/group/asterisk-cpp/main/Makefile (original)
+++ team/group/asterisk-cpp/main/Makefile Sat Jan 10 19:41:23 2009
@@ -17,7 +17,7 @@
 
 include $(ASTTOPDIR)/Makefile.moddir_rules
 
-OBJS= tcptls.o io.o sched.o logger.o frame.o loader.o config.o channel.o \
+OBJS= tdd.o tcptls.o io.o sched.o logger.o frame.o loader.o config.o channel.o \
 	translate.o file.o pbx.o cli.o md5.o term.o \
 	ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
 	cdr.o tdd.o acl.o rtp.o udptl.o manager.o asterisk.o \
@@ -149,7 +149,7 @@
 AST_EMBED_LDSCRIPTS:=$(sort $(EMBED_LDSCRIPTS))
 AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED_LDFLAGS),$(value $(dep)))
 AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
-OBJS:=$(sort $(OBJS))
+#OBJS:=$(sort $(OBJS))
 
 ifneq ($(wildcard ../channels/h323/Makefile.ast),)
   include ../channels/h323/Makefile.ast

Modified: team/group/asterisk-cpp/main/tdd.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/main/tdd.c?view=diff&rev=168412&r1=168411&r2=168412
==============================================================================
--- team/group/asterisk-cpp/main/tdd.c (original)
+++ team/group/asterisk-cpp/main/tdd.c Sat Jan 10 19:41:23 2009
@@ -98,7 +98,7 @@
 struct tdd_state *tdd_new(void)
 {
 	struct tdd_state *tdd;
-	tdd = calloc(1, sizeof(*tdd));
+	tdd = (struct tdd_state *) calloc(1, sizeof(*tdd));
 	if (tdd) {
 #ifdef INTEGER_CALLERID
 		tdd->fskd.ispb = 176;        /* 45.5 baud */
@@ -145,7 +145,7 @@
 	int pos = 0;
 	int cnt;
 	while (len) {
-		cnt = len > sizeof(ecdisa) ? sizeof(ecdisa) : len;
+		cnt = len > (int) sizeof(ecdisa) ? sizeof(ecdisa) : len;
 		memcpy(outbuf + pos, ecdisa, cnt);
 		pos += cnt;
 		len -= cnt;
@@ -160,7 +160,7 @@
 	int b = 'X';
 	int res;
 	int c,x;
-	short *buf = calloc(1, 2 * len + tdd->oldlen);
+	short *buf = (short *) calloc(1, 2 * len + tdd->oldlen);
 	short *obuf = buf;
 	if (!buf) {
 		ast_log(LOG_WARNING, "Out of memory\n");
@@ -292,9 +292,9 @@
 	int i,x;
 	char c;
 	/*! Baudot letters */
-	static unsigned char lstr[31] = "\000E\nA SIU\rDRJNFCKTZLWHYPQOBG\000MXV";
+	static unsigned char lstr[32] = "\000E\nA SIU\rDRJNFCKTZLWHYPQOBG\000MXV";
 	/*! Baudot figures */
-	static unsigned char fstr[31] = "\0003\n- \00787\r$4',!:(5\")2\0006019?+\000./;";
+	static unsigned char fstr[32] = "\0003\n- \00787\r$4',!:(5\")2\0006019?+\000./;";
 	/* Initial carriers (real/imaginary) */
 	float cr = 1.0;
 	float ci = 0.0;