patch files for ace/Svc_Conf_[ly].cpp

2 files changed, 518 insertions, 0 deletions

diff --git a/etc/Svc_Conf_l.cpp.diff b/etc/Svc_Conf_l.cpp.diff
new file mode 100644
index 00000000000..61559490d3a
--- /dev/null
+++ b/etc/Svc_Conf_l.cpp.diff
@@ -0,0 +1,253 @@
+--- Svc_Conf_l.cpp.orig	Thu Oct 30 21:08:12 1997
++++ Svc_Conf_l.cpp	Thu Oct 30 21:09:58 1997
+@@ -1,3 +1,6 @@
++// $Id$
++
++#define ACE_BUILD_DLL
+ #include "ace/config.h"
+ #if defined (ACE_HAS_TERM_IOCTLS) /* to avoid conflict with sys/termios.h ECHO */
+ #undef ACE_HAS_TERM_IOCTLS
+@@ -8,7 +11,7 @@
+ /* A lexical scanner generated by flex */
+ 
+ /* Scanner skeleton version:
+- * $Header: /home/daffy/u0/vern/flex/flex-2.4.7/RCS/flex.skl,v 1.2 94/08/03 11:13:24 vern Exp $
++ * $Header$
+  */
+ 
+ #define FLEX_SCANNER
+@@ -141,7 +144,9 @@
+ 		} \
+ 	while ( 0 )
+ 
++#if 0
+ #define unput(c) ace_yyunput( c, ace_yytext_ptr )
++#endif /* 0 */
+ 
+ 
+ struct ace_yy_buffer_state
+@@ -216,7 +221,9 @@
+  */
+ static int ace_yy_did_buffer_switch_on_eof;
+ 
++#if 0
+ static void ace_yyunput YY_PROTO(( int c, char *buf_ptr ));
++#endif /* 0 */
+ void ace_yyrestart YY_PROTO(( FILE *input_file ));
+ void ace_yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
+ void ace_yy_load_buffer_state YY_PROTO(( void ));
+@@ -224,12 +231,14 @@
+ void ace_yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
+ void ace_yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
+ 
++#if 0
+ static int ace_yy_start_stack_ptr = 0;
+ static int ace_yy_start_stack_depth = 0;
+ static int *ace_yy_start_stack = 0;
+ static void ace_yy_push_state YY_PROTO(( int new_state ));
+ static void ace_yy_pop_state YY_PROTO(( void ));
+ static int ace_yy_top_state YY_PROTO(( void ));
++#endif /* 0 */
+ 
+ static void *ace_yy_flex_alloc YY_PROTO(( unsigned int ));
+ static void *ace_yy_flex_realloc YY_PROTO(( void *, unsigned int ));
+@@ -466,7 +475,7 @@
+ #include "ace/Svc_Conf.h"
+ #include "ace/Svc_Conf_Tokens.h"
+ 
+-// Keeps track of the current line for debugging output. 
++// Keeps track of the current line for debugging output.
+ int ace_yylineno = 1;
+ 
+ // Keeps track of the number of errors encountered so far.
+@@ -661,112 +670,112 @@
+ YY_USER_ACTION
+ # line 35 "Svc_Conf.l"
+ { return token (ACE_DYNAMIC); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 3:
+ YY_USER_ACTION
+ # line 36 "Svc_Conf.l"
+ { return token (ACE_STATIC); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 4:
+ YY_USER_ACTION
+ # line 37 "Svc_Conf.l"
+ { return token (ACE_SUSPEND); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 5:
+ YY_USER_ACTION
+ # line 38 "Svc_Conf.l"
+ { return token (ACE_RESUME); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 6:
+ YY_USER_ACTION
+ # line 39 "Svc_Conf.l"
+ { return token (ACE_REMOVE); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 7:
+ YY_USER_ACTION
+ # line 40 "Svc_Conf.l"
+ { return token (ACE_USTREAM); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 8:
+ YY_USER_ACTION
+ # line 41 "Svc_Conf.l"
+ { return token (ACE_MODULE_T); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 9:
+ YY_USER_ACTION
+ # line 42 "Svc_Conf.l"
+ { return token (ACE_SVC_OBJ_T); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 10:
+ YY_USER_ACTION
+ # line 43 "Svc_Conf.l"
+ { return token (ACE_STREAM_T); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 11:
+ YY_USER_ACTION
+ # line 44 "Svc_Conf.l"
+ { return token (ACE_ACTIVE); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 12:
+ YY_USER_ACTION
+ # line 45 "Svc_Conf.l"
+ { return token (ACE_INACTIVE); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 13:
+ YY_USER_ACTION
+ # line 46 "Svc_Conf.l"
+ { return token (ACE_COLON); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 14:
+ YY_USER_ACTION
+ # line 47 "Svc_Conf.l"
+ { return token (ACE_STAR); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 15:
+ YY_USER_ACTION
+ # line 48 "Svc_Conf.l"
+ { return token (ACE_LPAREN); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 16:
+ YY_USER_ACTION
+ # line 49 "Svc_Conf.l"
+ { return token (ACE_RPAREN); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 17:
+ YY_USER_ACTION
+ # line 50 "Svc_Conf.l"
+ { return token (ACE_LBRACE); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 18:
+ YY_USER_ACTION
+ # line 51 "Svc_Conf.l"
+ { return token (ACE_RBRACE); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 19:
+ YY_USER_ACTION
+ # line 52 "Svc_Conf.l"
+ { // Eliminate the opening and closing double quotes
+ 		        *strrchr (ace_yytext, '"') = '\0';
+ 			ace_yyleng -= 1;
+-                        ace_yylval.ident_ = ace_obstack->copy (ace_yytext + 1, ace_yyleng); 
++                        ace_yylval.ident_ = ace_obstack->copy (ace_yytext + 1, ace_yyleng);
+ 			return token (ACE_STRING); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 20:
+ YY_USER_ACTION
+ # line 57 "Svc_Conf.l"
+-{ 
+-		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng); 
+-			return token (ACE_IDENT); 
++{
++		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
++			return token (ACE_IDENT);
+ 		      }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 21:
+ YY_USER_ACTION
+ # line 61 "Svc_Conf.l"
+-{ 
+-		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng); 
+-			return token (ACE_PATHNAME); 
++{
++		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
++			return token (ACE_PATHNAME);
+ 		      }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 22:
+ YY_USER_ACTION
+ # line 65 "Svc_Conf.l"
+@@ -787,7 +796,7 @@
+ case YY_STATE_EOF(NORMAL):
+ # line 68 "Svc_Conf.l"
+ { YY_NEW_FILE; ace_yyterminate(); }
+-	YY_BREAK
++	/* YY_BREAK */
+ case 25:
+ YY_USER_ACTION
+ # line 69 "Svc_Conf.l"
+@@ -1120,6 +1129,7 @@
+ 	}
+ 
+ 
++#if 0
+ #ifdef YY_USE_PROTOS
+ static void ace_yyunput( int c, register char *ace_yy_bp )
+ #else
+@@ -1164,7 +1174,7 @@
+ 	 */
+ 	YY_DO_BEFORE_ACTION; /* set up ace_yytext again */
+ 	}
+-
++#endif /* 0 */
+ 
+ #ifdef __cplusplus
+ static int ace_yyinput()
+@@ -1372,6 +1382,7 @@
+ 	}
+ 
+ 
++#if 0
+ #ifdef YY_USE_PROTOS
+ static void ace_yy_push_state( int new_state )
+ #else
+@@ -1417,7 +1428,7 @@
+ 	{
+ 	return ace_yy_start_stack[ace_yy_start_stack_ptr - 1];
+ 	}
+-
++#endif /* 0 */
+ 
+ #ifdef YY_USE_PROTOS
+ static void ace_yy_fatal_error( const char msg[] )
+@@ -1504,6 +1515,6 @@
+ {
+   ::fflush (ace_yyin);
+   ace_yytext[0] = '#';
+-  ace_yyleng = 0;    
++  ace_yyleng = 0;
+   return 1;
+ }
diff --git a/etc/Svc_Conf_y.cpp.diff b/etc/Svc_Conf_y.cpp.diff
new file mode 100644
index 00000000000..91c397e2256
--- /dev/null
+++ b/etc/Svc_Conf_y.cpp.diff
@@ -0,0 +1,265 @@
+--- Svc_Conf_y.cpp.orig	Thu Oct 30 21:08:18 1997
++++ Svc_Conf_y.cpp	Thu Oct 30 21:09:35 1997
+@@ -1,3 +1,5 @@
++// $Id$
++
+ #ifndef lint
+ char ace_yysccsid[] = "@(#)yaccpar	1.4 (Berkeley) 02/25/90 \n\
+  Modified 5/2/90 by J. Roskind to support graphic debugging modes";
+@@ -12,9 +14,9 @@
+ static ACE_Module_Type *get_module (ACE_Static_Node *str_rec, ACE_Static_Node *svc_type);
+ static ACE_Module_Type *get_module (ACE_Static_Node *str_rec, const char *svc_name);
+ 
+-#define YYDEBUG_LEXER_TEXT (ace_yytext[ace_yyleng] = '\0', ace_yytext) 
++#define YYDEBUG_LEXER_TEXT (ace_yytext[ace_yyleng] = '\0', ace_yytext)
+ /* Force the pretty debugging code to compile.*/
+-#define YYDEBUG 1 
++#define YYDEBUG 1
+ 
+ /* Efficient memory allocation technique.*/
+ ACE_Obstack *ace_obstack;
+@@ -250,7 +252,7 @@
+ void
+ ace_yyerror (char *s)
+ {
+-  ACE_ERROR ((LM_ERROR, "[error %d] on line %d: %s\n", 
++  ACE_ERROR ((LM_ERROR, "[error %d] on line %d: %s\n",
+ 	      ++ace_yyerrno, ace_yylineno, s));
+ }
+ 
+@@ -309,9 +311,9 @@
+ }
+ 
+ ACE_Service_Type_Impl *
+-ace_create_service_type (const char *name, 
+-			 int type, 
+-			 const void *symbol, 
++ace_create_service_type (const char *name,
++			 int type,
++			 const void *symbol,
+ 			 u_int flags)
+ {
+   ACE_Service_Type_Impl *stp = 0;
+@@ -324,17 +326,17 @@
+     {
+     case ACE_SVC_OBJ_T:
+       ACE_NEW_RETURN (stp,
+-		      ACE_Service_Object_Type ((ACE_Service_Object *) symbol, name, flags), 
++		      ACE_Service_Object_Type ((ACE_Service_Object *) symbol, name, flags),
+ 		      0);
+       break;
+     case ACE_MODULE_T:
+       ACE_NEW_RETURN (stp,
+-		      ACE_Module_Type (symbol, name, flags), 
++		      ACE_Module_Type (symbol, name, flags),
+ 		      0);
+       break;
+     case ACE_STREAM_T:
+       ACE_NEW_RETURN (stp,
+-		      ACE_Stream_Type (symbol, name, flags), 
++		      ACE_Stream_Type (symbol, name, flags),
+ 		      0);
+       break;
+     default:
+@@ -352,11 +354,11 @@
+ // Name given on the command-line to envoke the program.
+ char *program_name;
+ 
+-// Main driver program. 
++// Main driver program.
+ 
+-int 
++int
+ main (int argc, char *argv[])
+-{ 
++{
+   ace_yyin = stdin;
+   ace_obstack = new ACE_Obstack;
+ 
+@@ -395,7 +397,7 @@
+ #endif /* YYDEBUG_INDENT */
+ #ifndef YYDEBUG_REDUCE
+ #ifdef __cplusplus
+-void YYDEBUG_REDUCE(int ace_yynew_state, int ace_yyrule_num, char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count)
++void YYDEBUG_REDUCE(int /* ace_yynew_state */, int /* ace_yyrule_num */, char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count)
+ #else
+ YYDEBUG_REDUCE(ace_yynew_state, ace_yyrule_num, ace_yyrule_string, ace_yynew_indent, ace_yyrhs_count)
+ int ace_yynew_state;
+@@ -425,7 +427,7 @@
+ #endif /* YYDEBUG_REDUCE */
+ #ifndef YYDEBUG_SHIFT_LEXEME
+ #ifdef __cplusplus
+-void YYDEBUG_SHIFT_LEXEME(int ace_yyold_state, int ace_yynew_state, char *ace_yytoken_string, int ace_yynew_indent)
++void YYDEBUG_SHIFT_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state */, char *ace_yytoken_string, int ace_yynew_indent)
+ #else
+ YYDEBUG_SHIFT_LEXEME(ace_yyold_state, ace_yynew_state, ace_yytoken_string, ace_yynew_indent)
+ int ace_yyold_state;
+@@ -440,7 +442,7 @@
+ #endif /*  YYDEBUG_SHIFT_LEXEME */
+ #ifndef YYDEBUG_LOOK_AHEAD
+ #ifdef __cplusplus
+-void YYDEBUG_LOOK_AHEAD(int ace_yynew_state, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent)
++void YYDEBUG_LOOK_AHEAD(int /* ace_yynew_state */, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent)
+ #else
+ YYDEBUG_LOOK_AHEAD(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
+ int ace_yynew_state;
+@@ -457,7 +459,7 @@
+ #endif /* YYDEBUG_LOOK_AHEAD */
+ #ifndef YYDEBUG_DISCARD_STATE
+ #ifdef __cplusplus
+-void YYDEBUG_DISCARD_STATE(int ace_yynew_state, int ace_yyindent)
++void YYDEBUG_DISCARD_STATE(int /* ace_yynew_state */, int ace_yyindent)
+ #else
+ YYDEBUG_DISCARD_STATE(ace_yynew_state, ace_yyindent)
+ int ace_yynew_state;
+@@ -485,7 +487,7 @@
+ #endif /* YYDEBUG_DISCARD_STATE */
+ #ifndef YYDEBUG_DISCARD_TOKEN
+ #ifdef __cplusplus
+-void YYDEBUG_DISCARD_TOKEN(int ace_yynew_state, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent)
++void YYDEBUG_DISCARD_TOKEN(int /* ace_yynew_state */, int /* ace_yytoken_num */, char *ace_yytoken_string, int ace_yyindent)
+ #else
+ YYDEBUG_DISCARD_TOKEN(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
+ int ace_yynew_state;
+@@ -500,7 +502,7 @@
+ #endif /* YYDEBUG_DISCARD_TOKEN */
+ #ifndef YYDEBUG_SHIFT_ERROR_LEXEME
+ #ifdef __cplusplus
+-void YYDEBUG_SHIFT_ERROR_LEXEME(int ace_yyold_state, int ace_yynew_state, int ace_yyindent)
++void YYDEBUG_SHIFT_ERROR_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state */, int ace_yyindent)
+ #else
+ YYDEBUG_SHIFT_ERROR_LEXEME(ace_yyold_state, ace_yynew_state, ace_yyindent)
+ int ace_yyold_state;
+@@ -526,7 +528,7 @@
+     extern char *ace_foo();
+ #endif
+ 
+-    if (ace_yys = ACE_OS::getenv("YYDEBUG"))
++    if ((ace_yys = ACE_OS::getenv("YYDEBUG")))
+     {
+         ace_yyn = *ace_yys;
+         if (ace_yyn >= '0' && ace_yyn <= '9')
+@@ -543,7 +545,7 @@
+     *ace_yyssp = ace_yystate = 0;
+ 
+ ace_yyloop:
+-    if (ace_yyn = ace_yydefred[ace_yystate]) goto ace_yyreduce;
++    if ((ace_yyn = ace_yydefred[ace_yystate])) goto ace_yyreduce;
+     if (ace_yychar < 0)
+     {
+         if ((ace_yychar = ace_yylex()) < 0) ace_yychar = 0;
+@@ -653,7 +655,7 @@
+             if (5 < ace_yydebug)
+                 printf("ace_yydebug: state %d, error recovery discards token %d (%s)\n",
+                     ace_yystate, ace_yychar, ace_yys);
+-            else 
++            else
+                 YYDEBUG_DISCARD_TOKEN(ace_yystate, ace_yychar, ace_yys, ace_yyssp-ace_yyss);
+         }
+ #endif
+@@ -680,18 +682,18 @@
+       {
+ 	ace_yyvsp[0].parse_node_->apply (); delete ace_yyvsp[0].parse_node_;
+       }
+-      ace_obstack->release (); 
++      ace_obstack->release ();
+     }
+ break;
+ case 2:
+ #line 46 "Svc_Conf.y"
+-{ 
+-      ace_obstack->release (); 
++{
++      ace_obstack->release ();
+     }
+ break;
+ case 10:
+ #line 63 "Svc_Conf.y"
+-{ 
++{
+       if (ace_yyvsp[-1].svc_record_ != 0)
+ 	ace_yyval.parse_node_ = new ACE_Dynamic_Node (ace_yyvsp[-1].svc_record_, ace_yyvsp[0].ident_);
+       else
+@@ -700,25 +702,25 @@
+ break;
+ case 11:
+ #line 73 "Svc_Conf.y"
+-{ 
++{
+       ace_yyval.parse_node_ = new ACE_Static_Node (ace_yyvsp[-1].ident_, ace_yyvsp[0].ident_);
+     }
+ break;
+ case 12:
+ #line 80 "Svc_Conf.y"
+-{ 
++{
+       ace_yyval.parse_node_ = new ACE_Suspend_Node (ace_yyvsp[0].ident_);
+     }
+ break;
+ case 13:
+ #line 87 "Svc_Conf.y"
+-{ 
++{
+       ace_yyval.parse_node_ = new ACE_Resume_Node (ace_yyvsp[0].ident_);
+     }
+ break;
+ case 14:
+ #line 94 "Svc_Conf.y"
+-{ 
++{
+       ace_yyval.parse_node_ = new ACE_Remove_Node (ace_yyvsp[0].ident_);
+     }
+ break;
+@@ -750,9 +752,9 @@
+ break;
+ case 20:
+ #line 121 "Svc_Conf.y"
+-{ 
++{
+       /* Initialize left context...*/
+-      ace_yyval.static_node_ = ace_yyvsp[-1].static_node_; 
++      ace_yyval.static_node_ = ace_yyvsp[-1].static_node_;
+     }
+ break;
+ case 21:
+@@ -790,7 +792,7 @@
+ break;
+ case 26:
+ #line 152 "Svc_Conf.y"
+-{ 
++{
+       ACE_Module_Type *mt = get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ());
+ 
+       if (((ACE_Stream_Type *) (ace_yyvsp[-2].static_node_)->record ()->type ())->push (mt) == -1)
+@@ -799,7 +801,7 @@
+ break;
+ case 27:
+ #line 159 "Svc_Conf.y"
+-{ 
++{
+       ACE_Module_Type *mt = get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ());
+       if (mt != 0)
+ 	mt->suspend ();
+@@ -815,9 +817,9 @@
+ break;
+ case 29:
+ #line 171 "Svc_Conf.y"
+-{ 
++{
+       ACE_Module_Type *mt = get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ());
+-      if (mt != 0 
++      if (mt != 0
+ 	  && ((ACE_Stream_Type *) (ace_yyvsp[-2].static_node_)->record ()->type ())->remove (mt) == -1)
+ 	{
+ 	  ACE_ERROR ((LM_ERROR, "cannot remove Module_Type %s from STREAM_Type %s\n",
+@@ -829,8 +831,8 @@
+ case 30:
+ #line 185 "Svc_Conf.y"
+ {
+-      u_int flags 
+-	= ACE_Service_Type::DELETE_THIS 
++      u_int flags
++	= ACE_Service_Type::DELETE_THIS
+ 	| (ace_yyvsp[-1].location_node_->dispose () == 0 ? 0 : ACE_Service_Type::DELETE_OBJ);
+       const void *sym = ace_yyvsp[-1].location_node_->symbol ();
+