fix a selection expression, skip a bypass

From-SVN: r27468

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index be98eeb..7ffc7ba 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3,6 +3,8 @@ Thu Jun 10 06:55 1999  Bruce Korb <ddsinc09@ix.netcom.com>
        *fixinc/inclhack.def(sun_auth_proto): We do not know how to
        test for the presence of valid prototypes.  Delete bypass expr.
        (ioctl_fix_ctrl): Correct the selection expression.
+       *fixinc/fixincl.x: regen
+       *fixinc/inclhack.sh: regen
 
 Thu Jun 10 15:08:15 1999  Nick Clifton  <nickc@cygnus.com>
 

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 4d12a4d..c09c194 100644 (file)
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -1104,7 +1104,7 @@ tSCC zIoctl_Fix_CtrlName[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zIoctl_Fix_CtrlSelect0[] =
-       "CTRL[ \t]";
+       "CTRL[ \t]*\\(";
 
 #define    IOCTL_FIX_CTRL_TEST_CT  1
 #define    IOCTL_FIX_CTRL_RE_CT    1
@@ -2619,16 +2619,9 @@ tSCC zSun_Auth_ProtoList[] =
 tSCC zSun_Auth_ProtoSelect0[] =
        "\\(\\*[a-z][a-z_]*\\)\\(\\)";
 
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSun_Auth_ProtoBypass0[] =
-       "^[a-zA-Z0-9_ \t]*\\(\\*[a-z][a-z_]*\\)\\([ \t]*[a-zA-Z.].*\\)";
-
-#define    SUN_AUTH_PROTO_TEST_CT  2
-#define    SUN_AUTH_PROTO_RE_CT    2
+#define    SUN_AUTH_PROTO_TEST_CT  1
+#define    SUN_AUTH_PROTO_RE_CT    1
 tTestDesc aSun_Auth_ProtoTests[] = {
-  { TT_NEGREP, zSun_Auth_ProtoBypass0,   (regex_t*)NULL },
   { TT_EGREP,  zSun_Auth_ProtoSelect0,   (regex_t*)NULL }, };
 
 /*
@@ -3815,7 +3808,7 @@ cat > /dev/null",
  *
  *  List of all fixes
  */
-#define  REGEX_COUNT  75
+#define  REGEX_COUNT  74
 #define  FIX_COUNT    104
 tFixDesc fixDescList[ FIX_COUNT ] = {
   {  zAix_SyswaitName,    zAix_SyswaitList,

diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh
index 055c20e..362e548 100755 (executable)
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -1078,7 +1078,7 @@ extern "C" {\
     #
     # Fix  31:  Ioctl_Fix_Ctrl
     #
-    if ( test -n "`egrep 'CTRL[        ]' ${file}`"
+    if ( test -n "`egrep 'CTRL[        ]*\\(' ${file}`"
        ) > /dev/null 2>&1 ; then
     fixlist="${fixlist}
       ioctl_fix_ctrl"
@@ -2166,8 +2166,7 @@ void      (*signal(...))(...);\
        ./rpc/clnt.h | \
        ./rpc/svc.h | \
        ./rpc/xdr.h )
-    if ( test -n "`egrep '\\(\\*[a-z][a-z_]*\\)\\(\\)' ${file}`" -a \
-              -z "`egrep '^[a-zA-Z0-9_         ]*\\(\\*[a-z][a-z_]*\\)\\([     ]*[a-zA-Z.].*\\)' ${file}`"
+    if ( test -n "`egrep '\\(\\*[a-z][a-z_]*\\)\\(\\)' ${file}`"
        ) > /dev/null 2>&1 ; then
     fixlist="${fixlist}
       sun_auth_proto"