[svn-commits] tilghman: branch 1.4 r225103 - /branches/1.4/apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Oct 21 10:45:54 2009
New Revision: 225103

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=225103
Log:
Suffix is not needed for a match

Modified:
    branches/1.4/apps/app_voicemail.c

Modified: branches/1.4/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/apps/app_voicemail.c?view=diff&rev=225103&r1=225102&r2=225103
==============================================================================
--- branches/1.4/apps/app_voicemail.c (original)
+++ branches/1.4/apps/app_voicemail.c Wed Oct 21 10:45:54 2009
@@ -8889,29 +8889,19 @@
 static int load_module(void)
 {
 	int res;
-	char *adsi_loaded = ast_module_helper("", "res_adsi.so", 0, 0, 0, 0);
-	char *smdi_loaded = ast_module_helper("", "res_smdi.so", 0, 0, 0, 0);
+	char *adsi_loaded = ast_module_helper("", "res_adsi", 0, 0, 0, 0);
+	char *smdi_loaded = ast_module_helper("", "res_smdi", 0, 0, 0, 0);
 	free(adsi_loaded);
 	free(smdi_loaded);
 
 	if (!adsi_loaded) {
-		/* If embedded, res_adsi may be known as "res_adsi" not "res_adsi.so" */
-		adsi_loaded = ast_module_helper("", "res_adsi", 0, 0, 0, 0);
-		ast_free(adsi_loaded);
-		if (!adsi_loaded) {
-			ast_log(LOG_ERROR, "app_voicemail.so depends upon res_adsi.so\n");
-			return AST_MODULE_LOAD_DECLINE;
-		}
+		ast_log(LOG_ERROR, "app_voicemail.so depends upon res_adsi.so\n");
+		return AST_MODULE_LOAD_DECLINE;
 	}
 
 	if (!smdi_loaded) {
-		/* If embedded, res_smdi may be known as "res_smdi" not "res_smdi.so" */
-		smdi_loaded = ast_module_helper("", "res_smdi", 0, 0, 0, 0);
-		ast_free(smdi_loaded);
-		if (!smdi_loaded) {
-			ast_log(LOG_ERROR, "app_voicemail.so depends upon res_smdi.so\n");
-			return AST_MODULE_LOAD_DECLINE;
-		}
+		ast_log(LOG_ERROR, "app_voicemail.so depends upon res_smdi.so\n");
+		return AST_MODULE_LOAD_DECLINE;
 	}
 
 	my_umask = umask(0);