From: Jeremy McNamara <jj@nufone.net>
Date: Thu, 24 Jul 2003 23:29:04 +0000 (+0000)
Subject: rollback today's futile attempts properly
X-Git-Tag: 0.5.0~275
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cb0fe78ba2c8d8be9432cc018f7adc16af1d7b8;p=thirdparty%2Fasterisk.git

rollback today's futile attempts properly


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/h323/ast_h323.cpp b/channels/h323/ast_h323.cpp
index a827452abe..9f6f7f9ae7 100755
--- a/channels/h323/ast_h323.cpp
+++ b/channels/h323/ast_h323.cpp
@@ -205,9 +205,9 @@ int MyH323EndPoint::MakeCall(const PString & dest, PString & token,
 	
 	*callReference = connection->GetCallReference();
 	
-	if (strlen(callerid)) {
+	if (strlen(callerid))
 		connection->SetLocalPartyName(PString(callerid));
-	} 
+
 	connection->Unlock(); 	
 
 	if (h323debug) {
diff --git a/channels/h323/chan_h323.c b/channels/h323/chan_h323.c
index 4aeef6ed3d..017a164361 100755
--- a/channels/h323/chan_h323.c
+++ b/channels/h323/chan_h323.c
@@ -409,19 +409,6 @@ static int oh323_call(struct ast_channel *c, char *dest, int timeout)
 		p->calloptions.callerid = strdup(c->callerid);
 	}
 
-#if 0
-// Sumfing ain't right here
-	
-	char *tmp = strchr(c->callerid, '"');
-		if (!tmp) {
-			p->calloptions.callerid = malloc(sizeof(c->callerid+20)); // evil
-			sprintf(p->calloptions.callerid, "\"Unknown Name\" <%s>", c->callerid);
-		} else {
-
-		}
-
-#endif
-
 	res = h323_make_call(called_addr, &(p->cd), p->calloptions);
 
 	if (res) {