summaryrefslogtreecommitdiff
path: root/ace/Svc_Conf.y
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1997-10-14 06:50:06 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1997-10-14 06:50:06 +0000
commitebafe545c0d15b010f4c513a9375cf2de655b6d3 (patch)
tree382de6b65bb43b49754ef8ee8af0ad6e5c42628d /ace/Svc_Conf.y
parent4c7e1a5cb938f532a96dd288defe33837221ffad (diff)
downloadATCD-ebafe545c0d15b010f4c513a9375cf2de655b6d3.tar.gz
*** empty log message ***
Diffstat (limited to 'ace/Svc_Conf.y')
-rw-r--r--ace/Svc_Conf.y24
1 files changed, 20 insertions, 4 deletions
diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y
index 27f0584d33d..2b27b76b130 100644
--- a/ace/Svc_Conf.y
+++ b/ace/Svc_Conf.y
@@ -142,8 +142,16 @@ module
// Make sure that the Module has the same name as the
// Module_Type object from the svc.conf file.
- MT_Module *mp = (MT_Module *) mt->object ();
- mp->name ($<static_node_>1->name ());
+ const char *module_type_name = $<static_node_>1->name ();
+ ACE_Module<ACE_SYNCH> *mp = (ACE_Module<ACE_SYNCH> *) mt->object ();
+
+ if (ACE_OS::strcmp (mp->name (), module_type_name) != 0)
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ "warning: assigning Module_Type name %s to Module %s since names differ\n",
+ module_type_name, mp->name ()));
+ mp->name (module_type_name);
+ }
if (mt->init (args.argc (), args.argv ()) == -1
|| ((ACE_Stream_Type *) ($<static_node_>-1)->record ()->type ())->push (mt) == -1)
@@ -159,8 +167,16 @@ module
// Make sure that the Module has the same name as the
// Module_Type object from the svc.conf file.
- MT_Module *mp = (MT_Module *) mt->object ();
- mp->name ($<static_node_>1->name ());
+ const char *module_type_name = $<static_node_>1->name ();
+ ACE_Module<ACE_SYNCH> *mp = (ACE_Module<ACE_SYNCH> *) mt->object ();
+
+ if (ACE_OS::strcmp (mp->name (), module_type_name) != 0)
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ "warning: assigning Module_Type name %s to Module %s since names differ\n",
+ module_type_name, mp->name ()));
+ mp->name (module_type_name);
+ }
if (((ACE_Stream_Type *) ($<static_node_>-1)->record ()->type ())->push (mt) == -1)
yyerrno++;