[svn-commits] russell: branch group/newcdr r202224 - /team/group/newcdr/cel/cel_manager.c

[SVN commits to the Digium repositories]

Author: russell
Date: Sat Jun 20 15:58:23 2009
New Revision: 202224

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=202224
Log:
Don't mix tabs/spaces, don't treat unchanged config as a failure, constification

Modified:
    team/group/newcdr/cel/cel_manager.c

Modified: team/group/newcdr/cel/cel_manager.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/cel/cel_manager.c?view=diff&rev=202224&r1=202223&r2=202224
==============================================================================
--- team/group/newcdr/cel/cel_manager.c (original)
+++ team/group/newcdr/cel/cel_manager.c Sat Jun 20 15:58:23 2009
@@ -73,24 +73,24 @@
 	ast_strftime(start_time, sizeof(start_time), DATE_FORMAT, &timeresult);
 
 	manager_event(EVENT_FLAG_CALL, "CEL",
-        "EventName: %s\r\n"
-	    "AccountCode: %s\r\n"
-	    "CallerIDnum: %s\r\n"
-	    "CallerIDname: %s\r\n"
-	    "CallerIDani: %s\r\n"
-	    "CallerIDrdnis: %s\r\n"
-	    "CallerIDdnid: %s\r\n"
-	    "Exten: %s\r\n"
-	    "Context: %s\r\n"
-	    "Channel: %s\r\n"
-	    "Application: %s\r\n"
-	    "AppData: %s\r\n"
-	    "EventTime: %s\r\n"
-	    "AMAFlags: %s\r\n"
-	    "UniqueID: %s\r\n"
-	    "LinkedID: %s\r\n"
-	    "Userfield: %s\r\n"
-	    "Peer: %s\r\n",
+		"EventName: %s\r\n"
+		"AccountCode: %s\r\n"
+		"CallerIDnum: %s\r\n"
+		"CallerIDname: %s\r\n"
+		"CallerIDani: %s\r\n"
+		"CallerIDrdnis: %s\r\n"
+		"CallerIDdnid: %s\r\n"
+		"Exten: %s\r\n"
+		"Context: %s\r\n"
+		"Channel: %s\r\n"
+		"Application: %s\r\n"
+		"AppData: %s\r\n"
+		"EventTime: %s\r\n"
+		"AMAFlags: %s\r\n"
+		"UniqueID: %s\r\n"
+		"LinkedID: %s\r\n"
+		"Userfield: %s\r\n"
+		"Peer: %s\r\n",
 		record.event_name, record.account_code, record.caller_id_num,
 		record.caller_id_name, record.caller_id_ani, record.caller_id_rdnis,
 		record.caller_id_dnid, record.extension, record.context, record.channel_name,
@@ -101,7 +101,7 @@
 
 static int load_config(int reload)
 {
-	char *cat = NULL;
+	const char *cat = NULL;
 	struct ast_config *cfg;
 	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
 	struct ast_variable *v;
@@ -109,7 +109,7 @@
 
 	cfg = ast_config_load(CONF_FILE, config_flags);
 	if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
-		return -1;
+		return 0;
 	}
 
 	if (!cfg) {