[svn-commits] rmudgett: trunk r370298 - in /trunk: ./ main/cel.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu Jul 19 17:25:00 2012
New Revision: 370298

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=370298
Log:
Fix compiler warnings.

gcc (GCC) 4.2.4 has problems casting away constness.
........

Merged revisions 370275 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 370277 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/main/cel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/cel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/cel.c?view=diff&rev=370298&r1=370297&r2=370298
==============================================================================
--- trunk/main/cel.c (original)
+++ trunk/main/cel.c Thu Jul 19 17:25:00 2012
@@ -505,11 +505,10 @@
 		return NULL;
 	}
 
-	ast_channel_appl_set(tchan, app_data);
-	ast_channel_data_set(tchan, app_data + strlen(record.application_name) + 1);
-
-	strcpy((char *) ast_channel_appl(tchan), record.application_name);
-	strcpy((char *) ast_channel_data(tchan), record.application_data);
+	ast_channel_appl_set(tchan, strcpy(app_data, record.application_name));
+	ast_channel_data_set(tchan, strcpy(app_data + strlen(record.application_name) + 1,
+		record.application_data));
+
 	datastore->data = app_data;
 	ast_channel_datastore_add(tchan, datastore);