summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-08 20:35:33 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-08 20:35:33 +0000
commitce65ae2e851bcc7da28407f855b58a61e102d44c (patch)
tree7f0b2f4f1064108cac5b179ee4b96d966052d797 /etc
parent15ccf73a42bd725ca1a34d40bcc4d8c92623edb9 (diff)
downloadATCD-ce65ae2e851bcc7da28407f855b58a61e102d44c.tar.gz
(ACE_YY_DECL): initialize ace_yy_cp and ace_yy_bp to 0 to avoid egcs 1.1
warning about possible use before initialization.
Diffstat (limited to 'etc')
-rw-r--r--etc/Svc_Conf_l.cpp.diff64
1 files changed, 42 insertions, 22 deletions
diff --git a/etc/Svc_Conf_l.cpp.diff b/etc/Svc_Conf_l.cpp.diff
index b100d93e054..0d9d4a2ea5c 100644
--- a/etc/Svc_Conf_l.cpp.diff
+++ b/etc/Svc_Conf_l.cpp.diff
@@ -1,5 +1,5 @@
---- Svc_Conf_l.cpp.orig Tue May 5 12:04:05 1998
-+++ Svc_Conf_l.cpp Tue May 5 12:04:51 1998
+--- Svc_Conf_l.cpp.orig Thu Oct 8 15:14:45 1998
++++ Svc_Conf_l.cpp Thu Oct 8 15:16:27 1998
@@ -1,7 +1,8 @@
+#define ACE_BUILD_DLL
/* A lexical scanner generated by flex */
@@ -45,7 +45,34 @@
static void *ace_yy_flex_alloc ACE_YY_PROTO(( unsigned int ));
static void *ace_yy_flex_realloc ACE_YY_PROTO(( void *, unsigned int ));
-@@ -689,112 +696,112 @@
+@@ -480,7 +487,7 @@
+ char *ace_yytext;
+ # line 1 "Svc_Conf.l"
+ # line 2 "Svc_Conf.l"
+-// $Id: Svc_Conf.l,v 4.5 1998/07/18 16:42:01 gonzo Exp $
++// $Id$
+ // Sample lexical analysis for regular expression subset. Must be
+ // compiled with FLEX and an ANSI C++ compiler.
+
+@@ -488,7 +495,7 @@
+ #include "ace/Svc_Conf.h"
+ #include "ace/Svc_Conf_Tokens.h"
+
+-ACE_RCSID(ace, Svc_Conf_l, "$Id: Svc_Conf.l,v 4.5 1998/07/18 16:42:01 gonzo Exp $")
++ACE_RCSID(ace, Svc_Conf_l, "$Id$")
+
+ // Keeps track of the current line for debugging output.
+ int ace_yylineno = 1;
+@@ -591,7 +598,7 @@
+ ACE_YY_DECL
+ {
+ register ace_yy_state_type ace_yy_current_state;
+- register char *ace_yy_cp, *ace_yy_bp;
++ register char *ace_yy_cp = 0, *ace_yy_bp = 0;
+ register int ace_yy_act;
+
+ # line 39 "Svc_Conf.l"
+@@ -689,96 +696,96 @@
ACE_YY_USER_ACTION
# line 42 "Svc_Conf.l"
{ return token (ACE_DYNAMIC); }
@@ -154,39 +181,32 @@
- *strrchr (ace_yytext, '"') = '\0';
+ *ACE_OS::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);
+ ace_yylval.ident_ = ace_obstack->copy (ace_yytext + 1, ace_yyleng);
return token (ACE_STRING); }
- ACE_YY_BREAK
+ /* ACE_YY_BREAK */
case 20:
ACE_YY_USER_ACTION
# line 64 "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);
+@@ -786,7 +793,7 @@
+ ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
+ return token (ACE_IDENT);
}
- ACE_YY_BREAK
+ /* ACE_YY_BREAK */
case 21:
ACE_YY_USER_ACTION
# line 68 "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);
+@@ -794,7 +801,7 @@
+ ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
+ return token (ACE_PATHNAME);
}
- ACE_YY_BREAK
+ /* ACE_YY_BREAK */
case 22:
ACE_YY_USER_ACTION
# line 72 "Svc_Conf.l"
-@@ -808,14 +811,15 @@
+@@ -808,14 +815,15 @@
case 24:
ACE_YY_USER_ACTION
# line 74 "Svc_Conf.l"
@@ -204,7 +224,7 @@
case 25:
ACE_YY_USER_ACTION
# line 76 "Svc_Conf.l"
-@@ -1148,6 +1152,7 @@
+@@ -1148,6 +1156,7 @@
}
@@ -212,7 +232,7 @@
#ifdef ACE_YY_USE_PROTOS
static void ace_yyunput( int c, register char *ace_yy_bp )
#else
-@@ -1192,7 +1197,7 @@
+@@ -1192,7 +1201,7 @@
*/
ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */
}
@@ -221,7 +241,7 @@
#ifdef __cplusplus
static int ace_yyinput()
-@@ -1400,6 +1405,7 @@
+@@ -1400,6 +1409,7 @@
}
@@ -229,7 +249,7 @@
#ifdef ACE_YY_USE_PROTOS
static void ace_yy_push_state( int new_state )
#else
-@@ -1445,7 +1451,7 @@
+@@ -1445,7 +1455,7 @@
{
return ace_yy_start_stack[ace_yy_start_stack_ptr - 1];
}