Merged revisions 134086 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r134086 | kpfleming | 2008-07-28 11:42:00 -0500 (Mon, 28 Jul 2008) | 3 lines

remove remaining Zaptel references in various places


........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134087 f38db490-d61c-443f-a65b-d21fe96a405b

4 files changed, 6 insertions, 35 deletions

diff --git a/main/channel.c b/main/channel.c
index a287893e8..dfedb60b2 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3408,11 +3408,6 @@ struct ast_channel *ast_request(const char *type, int format, void *data, int *c
 		return NULL;
 	}
 
-	if (!strcasecmp(type, "Zap")) {
-		type = "DAHDI";
-		ast_log(LOG_NOTICE, "Zap interface translated to DAHDI.\n");
-	}
-
 	AST_LIST_TRAVERSE(&backends, chan, list) {
 		if (strcasecmp(type, chan->tech->type))
 			continue;
diff --git a/main/features.c b/main/features.c
index c6e741cca..e374b9185 100644
--- a/main/features.c
+++ b/main/features.c
@@ -2193,7 +2193,7 @@ static void *do_parking_thread(void *ignore)
 				if (pu->peername[0]) {
 					char *peername = ast_strdupa(pu->peername);
 					char *cp = strrchr(peername, '-');
-					char peername_flat[AST_MAX_EXTENSION]; /* using something like Zap/52 for an extension name is NOT a good idea */
+					char peername_flat[AST_MAX_EXTENSION]; /* using something like DAHDI/52 for an extension name is NOT a good idea */
 					int i;
 
 					if (cp) 
diff --git a/main/file.c b/main/file.c
index a8e5a6569..ca38d187d 100644
--- a/main/file.c
+++ b/main/file.c
@@ -661,15 +661,15 @@ static enum fsread_res ast_readaudio_callback(struct ast_filestream *s)
 	if (whennext != s->lasttimeout) {
 #ifdef HAVE_DAHDI
 		if (s->owner->timingfd > -1) {
-			int zap_timer_samples = whennext;
+			int dahdi_timer_samples = whennext;
 			int rate;
 			/* whennext is in samples, but DAHDI timers operate in 8 kHz samples. */
 			if ((rate = ast_format_rate(s->fmt->format)) != 8000) {
 				float factor;
 				factor = ((float) rate) / ((float) 8000.0); 
-				zap_timer_samples = (int) ( ((float) zap_timer_samples) / factor );
+				dahdi_timer_samples = (int) ( ((float) dahdi_timer_samples) / factor );
 			}
-			ast_settimeout(s->owner, zap_timer_samples, ast_fsread_audio, s);
+			ast_settimeout(s->owner, dahdi_timer_samples, ast_fsread_audio, s);
 		} else
 #endif		
 			s->owner->streamid = ast_sched_add(s->owner->sched, 
diff --git a/main/loader.c b/main/loader.c
index 3e71af867..616dc76aa 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -751,22 +751,6 @@ static struct load_order_entry *add_to_load_order(const char *resource, struct l
 	return order;
 }
 
-static int translate_module_name(const char *oldname, char *newname)
-{
-    if (!strcasecmp(oldname, "app_zapbarge.so"))
-        ast_copy_string(newname, "app_dahdibarge.so", 18);
-    else if(!strcasecmp(oldname, "app_zapras.so"))
-        ast_copy_string(newname, "app_dahdiras.so", 16);
-    else if(!strcasecmp(oldname, "app_zapscan.so"))
-        ast_copy_string(newname, "app_dahdiscan.so", 17);
-    else if(!strcasecmp(oldname, "codec_zap.so"))
-        ast_copy_string(newname, "codec_dahdi.so", 16);
-    else
-        return -1; /* no use for newname, oldname is fine */
-
-    return 0;
-}
-
 int load_modules(unsigned int preload_only)
 {
 	struct ast_config *cfg;
@@ -779,8 +763,6 @@ int load_modules(unsigned int preload_only)
 	struct ast_flags config_flags = { 0 };
 	int modulecount = 0;
 
-	int translate_status;
-	char newname[18]; /* although this would normally be 80, max length in translate_module_name is 18 */
 #ifdef LOADABLE_MODULES
 	struct dirent *dirent;
 	DIR *dir;
@@ -809,10 +791,7 @@ int load_modules(unsigned int preload_only)
 	/* first, find all the modules we have been explicitly requested to load */
 	for (v = ast_variable_browse(cfg, "modules"); v; v = v->next) {
 		if (!strcasecmp(v->name, preload_only ? "preload" : "load")) {
-			translate_status = translate_module_name(v->value, newname);
-				if (!translate_status)
-					ast_log(LOG_WARNING, "Use of old module name %s is deprecated, please use %s instead.\n", v->value, newname);
-			add_to_load_order(translate_status ? v->value : newname, &load_order);
+			add_to_load_order(v->value, &load_order);
 		}
 	}
 
@@ -869,10 +848,7 @@ int load_modules(unsigned int preload_only)
 			continue;
 
 		AST_LIST_TRAVERSE_SAFE_BEGIN(&load_order, order, entry) {
-			translate_status = translate_module_name(v->value, newname);
-			if (!resource_name_match(order->resource, translate_status ? v->value : newname)) {
-				 if (!translate_status)
-                        ast_log(LOG_WARNING, "Use of old module name %s is deprecated, please use %s instead.\n", v->value, newname);
+			if (!resource_name_match(order->resource, v->value)) {
 				AST_LIST_REMOVE_CURRENT(entry);
 				ast_free(order->resource);
 				ast_free(order);