/*
- * DO NOT EDIT THIS FILE (fixincl.x)
- *
- * It has been autogen-ed Sunday April 4, 1999 at 12:11:03 AM MST
- * From the definitions /puke/law//egcs/egcs/gcc/fixinc/inclhack.def
- * and the template file /puke/law//egcs/egcs/gcc/fixinc/fixincl.tpl
+ * DO NOT EDIT THIS FILE - it has been generated
*
* Install modified versions of certain ANSI-incompatible system header
* files which are fixed to work correctly with ANSI C and placed in a
* directory that GNU C will search.
*
- * This script contains 103 fixup scripts.
+ * This file contains 103 fixup descriptions.
*
* See README-fixinc for more information.
*
+ * inclhack copyright (c) 1999 The Free Software Foundation, Inc.
+ *
* inclhack is free software.
*
* You may redistribute it and/or modify it under the terms of the
#define apzAix_SyswaitMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zAix_SyswaitSelect0[] =
"bos325,";
#define AIX_SYSWAIT_TEST_CT 1
+#define AIX_SYSWAIT_RE_CT 1
tTestDesc aAix_SyswaitTests[] = {
- { TT_EGREP, zAix_SyswaitSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zAix_SyswaitSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Aix_Syswait
*/
const char* apzAix_SyswaitPatch[] = { "sed",
- "-e" "/^extern pid_t wait3();$/i\\\n"
+ "-e", "/^extern pid_t wait3();$/i\\\n"
"struct rusage;\n",
(char*)NULL };
#define apzAix_VolatileMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zAix_VolatileSelect0[] =
"typedef volatile int sig_atomic_t";
#define AIX_VOLATILE_TEST_CT 1
+#define AIX_VOLATILE_RE_CT 1
tTestDesc aAix_VolatileTests[] = {
- { TT_EGREP, zAix_VolatileSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zAix_VolatileSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Aix_Volatile
*/
const char* apzAix_VolatilePatch[] = { "sed",
- "-e" "s/typedef volatile int sig_atomic_t/typedef int sig_atomic_t/",
+ "-e", "s/typedef volatile int sig_atomic_t/typedef int sig_atomic_t/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzAlpha_GetoptMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zAlpha_GetoptSelect0[] =
"getopt\\(int, char \\*\\[";
#define ALPHA_GETOPT_TEST_CT 1
+#define ALPHA_GETOPT_RE_CT 1
tTestDesc aAlpha_GetoptTests[] = {
- { TT_EGREP, zAlpha_GetoptSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zAlpha_GetoptSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Alpha_Getopt
*/
const char* apzAlpha_GetoptPatch[] = { "sed",
- "-e" "s/getopt(int, char \\*\\[\\],[ ]*char \\*)/getopt(int, char *const[], const char *)/",
+ "-e", "s/getopt(int, char \\*\\[\\],[ ]*char \\*)/getopt(int, char *const[], const char *)/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzAlpha_ParensMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zAlpha_ParensSelect0[] =
"#ifndef\\(__mips64\\)";
#define ALPHA_PARENS_TEST_CT 1
+#define ALPHA_PARENS_RE_CT 1
tTestDesc aAlpha_ParensTests[] = {
- { TT_EGREP, zAlpha_ParensSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zAlpha_ParensSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Alpha_Parens
*/
const char* apzAlpha_ParensPatch[] = { "sed",
- "-e" "s/#ifndef(__mips64)/#ifndef __mips64/",
+ "-e", "s/#ifndef(__mips64)/#ifndef __mips64/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzAlpha_SbrkMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zAlpha_SbrkSelect0[] =
"char[ \t]*\\*[\t ]*sbrk[ \t]*\\(";
#define ALPHA_SBRK_TEST_CT 1
+#define ALPHA_SBRK_RE_CT 1
tTestDesc aAlpha_SbrkTests[] = {
- { TT_EGREP, zAlpha_SbrkSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zAlpha_SbrkSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Alpha_Sbrk
*/
const char* apzAlpha_SbrkPatch[] = { "sed",
- "-e" "s/char\\([ \t]*\\*[\t ]*sbrk[ \t]*(\\)/void\\1/",
+ "-e", "s/char\\([ \t]*\\*[\t ]*sbrk[ \t]*(\\)/void\\1/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*/
#define apzArm_Norcroft_HintMachs (const char**)NULL
#define ARM_NORCROFT_HINT_TEST_CT 0
+#define ARM_NORCROFT_HINT_RE_CT 0
#define aArm_Norcroft_HintTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Arm_Norcroft_Hint
*/
const char* apzArm_Norcroft_HintPatch[] = { "sed",
- "-e" "s/___type p_type/p_type/",
+ "-e", "s/___type p_type/p_type/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzArm_WcharMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zArm_WcharSelect0[] =
"#[ \t]*define[ \t]*__wchar_t";
#define ARM_WCHAR_TEST_CT 1
+#define ARM_WCHAR_RE_CT 1
tTestDesc aArm_WcharTests[] = {
- { TT_EGREP, zArm_WcharSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zArm_WcharSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Arm_Wchar
*/
const char* apzArm_WcharPatch[] = { "sed",
- "-e" "s/\\(#[ \t]*ifndef[ \t]*\\)__wchar_t/\\1_GCC_WCHAR_T/",
- "-e" "s/\\(#[ \t]*define[ \t]*\\)__wchar_t/\\1_GCC_WCHAR_T/",
+ "-e", "s/\\(#[ \t]*ifndef[ \t]*\\)__wchar_t/\\1_GCC_WCHAR_T/",
+ "-e", "s/\\(#[ \t]*define[ \t]*\\)__wchar_t/\\1_GCC_WCHAR_T/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzAux_AsmMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zAux_AsmSelect0[] =
"#ifndef NOINLINE";
#define AUX_ASM_TEST_CT 1
+#define AUX_ASM_RE_CT 1
tTestDesc aAux_AsmTests[] = {
- { TT_EGREP, zAux_AsmSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zAux_AsmSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Aux_Asm
*/
const char* apzAux_AsmPatch[] = { "sed",
- "-e" "s|#ifndef NOINLINE|#if !defined(NOINLINE) \\&\\& !defined(__GNUC__)|",
+ "-e", "s|#ifndef NOINLINE|#if !defined(NOINLINE) \\&\\& !defined(__GNUC__)|",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*/
#define apzAvoid_BoolMachs (const char**)NULL
#define AVOID_BOOL_TEST_CT 0
+#define AVOID_BOOL_RE_CT 0
#define aAvoid_BoolTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Avoid_Bool
*/
const char* apzAvoid_BoolPatch[] = { "sed",
- "-e" "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/i\\\n"
+ "-e", "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/i\\\n"
"#ifndef __cplusplus\n",
- "-e" "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/a\\\n"
+ "-e", "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/a\\\n"
"#endif\n",
- "-e" "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/i\\\n"
+ "-e", "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/i\\\n"
"#ifndef __cplusplus\n",
- "-e" "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/a\\\n"
+ "-e", "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/a\\\n"
"#endif\n",
(char*)NULL };
#define apzBad_Struct_TermMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zBad_Struct_TermSelect0[] =
"^[ \t]*typedef[ \t]+struct[ \t]+term[ \t]*;";
#define BAD_STRUCT_TERM_TEST_CT 1
+#define BAD_STRUCT_TERM_RE_CT 1
tTestDesc aBad_Struct_TermTests[] = {
- { TT_EGREP, zBad_Struct_TermSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zBad_Struct_TermSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Bad_Struct_Term
*/
const char* apzBad_Struct_TermPatch[] = { "sed",
- "-e" "s/^[ \t]*typedef[ \t][ \t]*\\(struct[ \t][ \t]*term[ \t]*;[ \t]*\\)$/\\1/",
+ "-e", "s/^[ \t]*typedef[ \t][ \t]*\\(struct[ \t][ \t]*term[ \t]*;[ \t]*\\)$/\\1/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*/
#define apzBadquoteMachs (const char**)NULL
#define BADQUOTE_TEST_CT 0
+#define BADQUOTE_RE_CT 0
#define aBadquoteTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Badquote
*/
const char* apzBadquotePatch[] = { "sed",
- "-e" "s/doesn't/does not/",
+ "-e", "s/doesn't/does not/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzBad_LvalMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zBad_LvalSelect0[] =
"^[ \t]*#[ \t]*pragma[ \t]extern_prefix";
#define BAD_LVAL_TEST_CT 1
+#define BAD_LVAL_RE_CT 1
tTestDesc aBad_LvalTests[] = {
- { TT_EGREP, zBad_LvalSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zBad_LvalSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Bad_Lval
*/
const char* apzBad_LvalPatch[] = { "sed",
- "-e" "s/^[ \t]*#[ \t]*define[ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*\\(_.\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/",
+ "-e", "s/^[ \t]*#[ \t]*define[ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*\\(_.\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzBroken_Assert_StdioMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zBroken_Assert_StdioSelect0[] =
"stderr";
/*
- * content bypass pattern
+ * content bypass pattern - skip fix if pattern found
*/
tSCC zBroken_Assert_StdioBypass0[] =
"include.*stdio.h";
#define BROKEN_ASSERT_STDIO_TEST_CT 2
+#define BROKEN_ASSERT_STDIO_RE_CT 2
tTestDesc aBroken_Assert_StdioTests[] = {
- { TT_NEGREP, zBroken_Assert_StdioBypass0, (regex_t*)NULL },
- { TT_EGREP, zBroken_Assert_StdioSelect0, (regex_t*)NULL } };
+ { TT_NEGREP, zBroken_Assert_StdioBypass0, (regex_t*)NULL },
+ { TT_EGREP, zBroken_Assert_StdioSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Broken_Assert_Stdio
*/
const char* apzBroken_Assert_StdioPatch[] = { "sed",
- "-e" "1i\\\n"
+ "-e", "1i\\\n"
"#include <stdio.h>\n",
(char*)NULL };
#define apzBroken_Assert_StdlibMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zBroken_Assert_StdlibSelect0[] =
"exit *\\(|abort *\\(";
/*
- * content bypass pattern
+ * content bypass pattern - skip fix if pattern found
*/
tSCC zBroken_Assert_StdlibBypass0[] =
"include.*stdlib.h";
#define BROKEN_ASSERT_STDLIB_TEST_CT 2
+#define BROKEN_ASSERT_STDLIB_RE_CT 2
tTestDesc aBroken_Assert_StdlibTests[] = {
- { TT_NEGREP, zBroken_Assert_StdlibBypass0, (regex_t*)NULL },
- { TT_EGREP, zBroken_Assert_StdlibSelect0, (regex_t*)NULL } };
+ { TT_NEGREP, zBroken_Assert_StdlibBypass0, (regex_t*)NULL },
+ { TT_EGREP, zBroken_Assert_StdlibSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Broken_Assert_Stdlib
*/
const char* apzBroken_Assert_StdlibPatch[] = { "sed",
- "-e" "1i\\\n"
+ "-e", "1i\\\n"
"#ifdef __cplusplus\\\n"
"#include <stdlib.h>\\\n"
"#endif\n",
#define apzBsd43_Io_MacrosMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zBsd43_Io_MacrosSelect0[] =
"BSD43__IO";
#define BSD43_IO_MACROS_TEST_CT 1
+#define BSD43_IO_MACROS_RE_CT 1
tTestDesc aBsd43_Io_MacrosTests[] = {
- { TT_EGREP, zBsd43_Io_MacrosSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zBsd43_Io_MacrosSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Bsd43_Io_Macros
*/
const char* apzBsd43_Io_MacrosPatch[] = { "sed",
- "-e" "/[ \t]BSD43__IO[A-Z]*[ \t]*(/s/(\\(.\\),/('\\1',/",
- "-e" "/#[ \t]*define[ \t]*[ \t]BSD43__IO/s/'\\([cgx]\\)'/\\1/g",
+ "-e", "/[ \t]BSD43__IO[A-Z]*[ \t]*(/s/(\\(.\\),/('\\1',/",
+ "-e", "/#[ \t]*define[ \t]*[ \t]BSD43__IO/s/'\\([cgx]\\)'/\\1/g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*/
#define apzDec_Intern_AsmMachs (const char**)NULL
#define DEC_INTERN_ASM_TEST_CT 0
+#define DEC_INTERN_ASM_RE_CT 0
#define aDec_Intern_AsmTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Dec_Intern_Asm
*/
const char* apzDec_Intern_AsmPatch[] = { "sed",
- "-e" "/^[ \t]*float[ \t]*fasm/i\\\n"
+ "-e", "/^[ \t]*float[ \t]*fasm/i\\\n"
"#ifdef __DECC\n",
- "-e" "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n"
+ "-e", "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n"
"#endif\n",
(char*)NULL };
#define apzNo_Double_SlashMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zNo_Double_SlashSelect0[] =
- "//[^\"*]";
+ "(^|[^:])//[^\"*]";
/*
- * content test pattern. A shell will deal with it later.
+ * perform the 'test' shell command - do fix on success
*/
tSCC zNo_Double_SlashTest0[] =
- "-z \"`echo ${file}|egrep '(cxx/|\\+\\+$|\\.hh$|\\.H$|\\.hxx$)'`\"";
+ "-z `echo ${file} | egrep '(cxx|\\+\\+)/' `";
#define NO_DOUBLE_SLASH_TEST_CT 2
+#define NO_DOUBLE_SLASH_RE_CT 1
tTestDesc aNo_Double_SlashTests[] = {
- { TT_TEST, zNo_Double_SlashTest0, 0 /* unused */ },
- { TT_EGREP, zNo_Double_SlashSelect0, (regex_t*)NULL } };
+ { TT_TEST, zNo_Double_SlashTest0, 0 /* unused */ },
+ { TT_EGREP, zNo_Double_SlashSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for No_Double_Slash
*/
const char* apzNo_Double_SlashPatch[] = { "sed",
- "-e" "/\\/\\/[^\"*]/s|//.*$||g",
+ "-e", "/\\(^|[^:]\\)\\/\\/[^\"*]/s|//.*$||g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*/
#define apzEcd_CursorMachs (const char**)NULL
#define ECD_CURSOR_TEST_CT 0
+#define ECD_CURSOR_RE_CT 0
#define aEcd_CursorTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Ecd_Cursor
*/
const char* apzEcd_CursorPatch[] = { "sed",
- "-e" "s/ecd.cursor/ecd_cursor/",
+ "-e", "s/ecd.cursor/ecd_cursor/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzElse_LabelMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zElse_LabelSelect0[] =
"^[ \t]*#[ \t]*else[ \t]+[!-.0-~]";
#define ELSE_LABEL_TEST_CT 1
+#define ELSE_LABEL_RE_CT 1
tTestDesc aElse_LabelTests[] = {
- { TT_EGREP, zElse_LabelSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zElse_LabelSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Else_Label
*/
const char* apzElse_LabelPatch[] = { "sed",
- "-e" ":loop\n"
+ "-e", ":loop\n"
"/\\\\$/N\n"
"s/\\\\$/\\\\+++fixinc_eol+++/\n"
"/\\\\$/b loop\n"
#define apzEndif_LabelMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zEndif_LabelSelect0[] =
"^[ \t]*#[ \t]*endif[ \t]+[!-.0-z{|}~]";
#define ENDIF_LABEL_TEST_CT 1
+#define ENDIF_LABEL_RE_CT 1
tTestDesc aEndif_LabelTests[] = {
- { TT_EGREP, zEndif_LabelSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zEndif_LabelSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Endif_Label
*/
const char* apzEndif_LabelPatch[] = { "sed",
- "-e" ":loop\n"
+ "-e", ":loop\n"
"/\\\\$/N\n"
"s/\\\\$/\\\\+++fixinc_eol+++/\n"
"/\\\\$/b loop\n"
#define apzHp_InlineMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zHp_InlineSelect0[] =
"include.*\"\\.\\./machine/";
#define HP_INLINE_TEST_CT 1
+#define HP_INLINE_RE_CT 1
tTestDesc aHp_InlineTests[] = {
- { TT_EGREP, zHp_InlineSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zHp_InlineSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Hp_Inline
*/
const char* apzHp_InlinePatch[] = { "sed",
- "-e" "s,\"../machine/inline.h\",<machine/inline.h>,",
- "-e" "s,\"../machine/psl.h\",<machine/psl.h>,",
+ "-e", "s,\"../machine/inline.h\",<machine/inline.h>,",
+ "-e", "s,\"../machine/psl.h\",<machine/psl.h>,",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzHp_SysfileMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zHp_SysfileSelect0[] =
"HPUX_SOURCE";
#define HP_SYSFILE_TEST_CT 1
+#define HP_SYSFILE_RE_CT 1
tTestDesc aHp_SysfileTests[] = {
- { TT_EGREP, zHp_SysfileSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zHp_SysfileSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Hp_Sysfile
*/
const char* apzHp_SysfilePatch[] = { "sed",
- "-e" "s/(\\.\\.\\.)/(struct file * ...)/",
+ "-e", "s/(\\.\\.\\.)/(struct file * ...)/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzCxx_UnreadyMachs (const char**)NULL
/*
- * content bypass pattern
+ * content bypass pattern - skip fix if pattern found
*/
tSCC zCxx_UnreadyBypass0[] =
"\"C\"|__BEGIN_DECLS";
#define CXX_UNREADY_TEST_CT 1
+#define CXX_UNREADY_RE_CT 1
tTestDesc aCxx_UnreadyTests[] = {
- { TT_NEGREP, zCxx_UnreadyBypass0, (regex_t*)NULL }, };
+ { TT_NEGREP, zCxx_UnreadyBypass0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Cxx_Unready
*/
const char* apzCxx_UnreadyPatch[] = { "sed",
- "-e" "1i\\\n"
+ "-e", "1i\\\n"
"#ifdef __cplusplus\\\n"
"extern \"C\" {\\\n"
"#endif\\\n"
"\n",
- "-e" "$a\\\n"
+ "-e", "$a\\\n"
"#ifdef __cplusplus\\\n"
"}\\\n"
"#endif\n",
*/
#define apzHpux_MaxintMachs (const char**)NULL
#define HPUX_MAXINT_TEST_CT 0
+#define HPUX_MAXINT_RE_CT 0
#define aHpux_MaxintTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Hpux_Maxint
*/
const char* apzHpux_MaxintPatch[] = { "sed",
- "-e" "/^#[ \t]*define[ \t]*MAXINT[ \t]/i\\\n"
+ "-e", "/^#[ \t]*define[ \t]*MAXINT[ \t]/i\\\n"
"#ifndef MAXINT\n",
- "-e" "/^#[ \t]*define[ \t]*MAXINT[ \t]/a\\\n"
+ "-e", "/^#[ \t]*define[ \t]*MAXINT[ \t]/a\\\n"
"#endif\n",
(char*)NULL };
#define apzHpux_SystimeMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zHpux_SystimeSelect0[] =
"^extern struct sigevent;";
#define HPUX_SYSTIME_TEST_CT 1
+#define HPUX_SYSTIME_RE_CT 1
tTestDesc aHpux_SystimeTests[] = {
- { TT_EGREP, zHpux_SystimeSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zHpux_SystimeSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Hpux_Systime
*/
const char* apzHpux_SystimePatch[] = { "sed",
- "-e" "s/^extern struct sigevent;/struct sigevent;/",
+ "-e", "s/^extern struct sigevent;/struct sigevent;/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzInteractv_Add1Machs (const char**)NULL
/*
- * content test pattern. A shell will deal with it later.
+ * perform the 'test' shell command - do fix on success
*/
tSCC zInteractv_Add1Test0[] =
" -d /etc/conf/kconfig.d";
" -n \"`grep _POSIX_VERSION /usr/include/sys/unistd.h`\"";
#define INTERACTV_ADD1_TEST_CT 2
+#define INTERACTV_ADD1_RE_CT 0
tTestDesc aInteractv_Add1Tests[] = {
- { TT_TEST, zInteractv_Add1Test0, 0 /* unused */ },
- { TT_TEST, zInteractv_Add1Test1, 0 /* unused */ }, };
+ { TT_TEST, zInteractv_Add1Test0, 0 /* unused */ },
+ { TT_TEST, zInteractv_Add1Test1, 0 /* unused */ }, };
/*
* Fix Command Arguments for Interactv_Add1
*/
const char* apzInteractv_Add1Patch[] = { "sed",
- "-e" "s/!defined(__STDC__) && !defined(_POSIX_SOURCE)/!defined(_POSIX_SOURCE)/",
+ "-e", "s/!defined(__STDC__) && !defined(_POSIX_SOURCE)/!defined(_POSIX_SOURCE)/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzInteractv_Add2Machs (const char**)NULL
/*
- * content test pattern. A shell will deal with it later.
+ * perform the 'test' shell command - do fix on success
*/
tSCC zInteractv_Add2Test0[] =
" -d /etc/conf/kconfig.d";
" -n \"`grep _POSIX_VERSION /usr/include/sys/unistd.h`\"";
#define INTERACTV_ADD2_TEST_CT 2
+#define INTERACTV_ADD2_RE_CT 0
tTestDesc aInteractv_Add2Tests[] = {
- { TT_TEST, zInteractv_Add2Test0, 0 /* unused */ },
- { TT_TEST, zInteractv_Add2Test1, 0 /* unused */ }, };
+ { TT_TEST, zInteractv_Add2Test0, 0 /* unused */ },
+ { TT_TEST, zInteractv_Add2Test1, 0 /* unused */ }, };
/*
* Fix Command Arguments for Interactv_Add2
*/
const char* apzInteractv_Add2Patch[] = { "sed",
- "-e" "s/fmod(double)/fmod(double, double)/",
+ "-e", "s/fmod(double)/fmod(double, double)/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzInteractv_Add3Machs (const char**)NULL
/*
- * content test pattern. A shell will deal with it later.
+ * perform the 'test' shell command - do fix on success
*/
tSCC zInteractv_Add3Test0[] =
" -d /etc/conf/kconfig.d";
" -n \"`grep _POSIX_VERSION /usr/include/sys/unistd.h`\"";
#define INTERACTV_ADD3_TEST_CT 2
+#define INTERACTV_ADD3_RE_CT 0
tTestDesc aInteractv_Add3Tests[] = {
- { TT_TEST, zInteractv_Add3Test0, 0 /* unused */ },
- { TT_TEST, zInteractv_Add3Test1, 0 /* unused */ }, };
+ { TT_TEST, zInteractv_Add3Test0, 0 /* unused */ },
+ { TT_TEST, zInteractv_Add3Test1, 0 /* unused */ }, };
/*
* Fix Command Arguments for Interactv_Add3
*/
const char* apzInteractv_Add3Patch[] = { "sed",
- "-e" "/CHILD_MAX/s,/\\* Max, Max,",
- "-e" "/OPEN_MAX/s,/\\* Max, Max,",
+ "-e", "/CHILD_MAX/s,/\\* Max, Max,",
+ "-e", "/OPEN_MAX/s,/\\* Max, Max,",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzIo_Def_QuotesMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zIo_Def_QuotesSelect0[] =
"[ \t](_|DES)IO[A-Z]*[ \t]*\\( *[^,']";
#define IO_DEF_QUOTES_TEST_CT 1
+#define IO_DEF_QUOTES_RE_CT 1
tTestDesc aIo_Def_QuotesTests[] = {
- { TT_EGREP, zIo_Def_QuotesSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zIo_Def_QuotesSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Io_Def_Quotes
*/
const char* apzIo_Def_QuotesPatch[] = { "sed",
- "-e" "s/\\([ \t](_|DES)IO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/",
- "-e" "/#[ \t]*define[ \t]*[ \t]_IO/s/'\\([cgxtf]\\)'/\\1/g",
- "-e" "/#[ \t]*define[ \t]*[ \t]DESIOC/s/'\\([cdgx]\\)'/\\1/g",
+ "-e", "s/\\([ \t](_|DES)IO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/",
+ "-e", "/#[ \t]*define[ \t]*[ \t]_IO/s/'\\([cgxtf]\\)'/\\1/g",
+ "-e", "/#[ \t]*define[ \t]*[ \t]DESIOC/s/'\\([cdgx]\\)'/\\1/g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzIoctl_Fix_CtrlMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zIoctl_Fix_CtrlSelect0[] =
"CTRL[ \t]";
#define IOCTL_FIX_CTRL_TEST_CT 1
+#define IOCTL_FIX_CTRL_RE_CT 1
tTestDesc aIoctl_Fix_CtrlTests[] = {
- { TT_EGREP, zIoctl_Fix_CtrlSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zIoctl_Fix_CtrlSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Ioctl_Fix_Ctrl
*/
const char* apzIoctl_Fix_CtrlPatch[] = { "sed",
- "-e" "/[^A-Z0-9_]CTRL[ \t]*(/s/\\([^']\\))/'\\1')/",
- "-e" "/[^A-Z0-9]_CTRL[ \t]*(/s/\\([^']\\))/'\\1')/",
- "-e" "/#[ \t]*define[ \t]*[ \t]CTRL/s/'\\([cgx]\\)'/\\1/g",
- "-e" "/#[ \t]*define[ \t]*[ \t]_CTRL/s/'\\([cgx]\\)'/\\1/g",
- "-e" "/#[ \t]*define[ \t]*[ \t]BSD43_CTRL/s/'\\([cgx]\\)'/\\1/g",
+ "-e", "/[^A-Z0-9_]CTRL[ \t]*(/s/\\([^']\\))/'\\1')/",
+ "-e", "/[^A-Z0-9]_CTRL[ \t]*(/s/\\([^']\\))/'\\1')/",
+ "-e", "/#[ \t]*define[ \t]*[ \t]CTRL/s/'\\([cgx]\\)'/\\1/g",
+ "-e", "/#[ \t]*define[ \t]*[ \t]_CTRL/s/'\\([cgx]\\)'/\\1/g",
+ "-e", "/#[ \t]*define[ \t]*[ \t]BSD43_CTRL/s/'\\([cgx]\\)'/\\1/g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*/
#define apzIp_Missing_SemiMachs (const char**)NULL
#define IP_MISSING_SEMI_TEST_CT 0
+#define IP_MISSING_SEMI_RE_CT 0
#define aIp_Missing_SemiTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Ip_Missing_Semi
*/
const char* apzIp_Missing_SemiPatch[] = { "sed",
- "-e" "/^struct/,/^};/s/}$/};/",
+ "-e", "/^struct/,/^};/s/}$/};/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*/
#define apzIrix_Multiline_CmntMachs (const char**)NULL
#define IRIX_MULTILINE_CMNT_TEST_CT 0
+#define IRIX_MULTILINE_CMNT_RE_CT 0
#define aIrix_Multiline_CmntTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Irix_Multiline_Cmnt
*/
const char* apzIrix_Multiline_CmntPatch[] = { "sed",
- "-e" "s@type of the result@type of the result */@",
- "-e" "s@of the sizeof@/* of the sizeof@",
+ "-e", "s@type of the result@type of the result */@",
+ "-e", "s@of the sizeof@/* of the sizeof@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzIrix_SockaddrMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zIrix_SockaddrSelect0[] =
"authdes_create.*struct sockaddr";
#define IRIX_SOCKADDR_TEST_CT 1
+#define IRIX_SOCKADDR_RE_CT 1
tTestDesc aIrix_SockaddrTests[] = {
- { TT_EGREP, zIrix_SockaddrSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zIrix_SockaddrSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Irix_Sockaddr
*/
const char* apzIrix_SockaddrPatch[] = { "sed",
- "-e" "/authdes_create.*struct sockaddr/i\\\n"
+ "-e", "/authdes_create.*struct sockaddr/i\\\n"
"struct sockaddr;\n",
(char*)NULL };
*/
#define apzIrix_Struct__FileMachs (const char**)NULL
#define IRIX_STRUCT__FILE_TEST_CT 0
+#define IRIX_STRUCT__FILE_RE_CT 0
#define aIrix_Struct__FileTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Irix_Struct__File
*/
const char* apzIrix_Struct__FilePatch[] = { "sed",
- "-e" "/xdrstdio_create.*struct __file_s/i\\\n"
+ "-e", "/xdrstdio_create.*struct __file_s/i\\\n"
"struct __file_s;\n",
(char*)NULL };
#define apzIsc_FmodMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zIsc_FmodSelect0[] =
"fmod\\(double\\)";
#define ISC_FMOD_TEST_CT 1
+#define ISC_FMOD_RE_CT 1
tTestDesc aIsc_FmodTests[] = {
- { TT_EGREP, zIsc_FmodSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zIsc_FmodSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Isc_Fmod
*/
const char* apzIsc_FmodPatch[] = { "sed",
- "-e" "s/fmod(double)/fmod(double, double)/",
+ "-e", "s/fmod(double)/fmod(double, double)/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
"m68k-motorola-sysv*",
(const char*)NULL };
#define MOTOROLA_NESTED_TEST_CT 0
+#define MOTOROLA_NESTED_RE_CT 0
#define aMotorola_NestedTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Motorola_Nested
*/
const char* apzMotorola_NestedPatch[] = { "sed",
- "-e" "s@^\\(#undef[ \t][ \t]*PIPE_BUF[ \t]*/\\* max # bytes atomic in write to a\\)$@\\1 */@",
- "-e" "s@\\(/\\*#define\tHUGE_VAL\t3.40282346638528860e+38 \\)\\(/\\*error value returned by Math lib\\*/\\)$@\\1*/ \\2@",
+ "-e", "s@^\\(#undef[ \t][ \t]*PIPE_BUF[ \t]*/\\* max # bytes atomic in write to a\\)$@\\1 */@",
+ "-e", "s@\\(/\\*#define\tHUGE_VAL\t3.40282346638528860e+38 \\)\\(/\\*error value returned by Math lib\\*/\\)$@\\1*/ \\2@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzIsc_Sys_LimitsMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zIsc_Sys_LimitsSelect0[] =
"CHILD_MAX";
#define ISC_SYS_LIMITS_TEST_CT 1
+#define ISC_SYS_LIMITS_RE_CT 1
tTestDesc aIsc_Sys_LimitsTests[] = {
- { TT_EGREP, zIsc_Sys_LimitsSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zIsc_Sys_LimitsSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Isc_Sys_Limits
*/
const char* apzIsc_Sys_LimitsPatch[] = { "sed",
- "-e" "/CHILD_MAX/s,/\\* Max, Max,",
- "-e" "/OPEN_MAX/s,/\\* Max, Max,",
+ "-e", "/CHILD_MAX/s,/\\* Max, Max,",
+ "-e", "/OPEN_MAX/s,/\\* Max, Max,",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzKandr_ConcatMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zKandr_ConcatSelect0[] =
"/\\*\\*/";
#define KANDR_CONCAT_TEST_CT 1
+#define KANDR_CONCAT_RE_CT 1
tTestDesc aKandr_ConcatTests[] = {
- { TT_EGREP, zKandr_ConcatSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zKandr_ConcatSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Kandr_Concat
*/
const char* apzKandr_ConcatPatch[] = { "sed",
- "-e" "s|/\\*\\*/|##|g",
+ "-e", "s|/\\*\\*/|##|g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzLimits_IfndefsMachs (const char**)NULL
/*
- * content bypass pattern
+ * content bypass pattern - skip fix if pattern found
*/
tSCC zLimits_IfndefsBypass0[] =
"ifndef[ \t]+FLT_MIN";
#define LIMITS_IFNDEFS_TEST_CT 1
+#define LIMITS_IFNDEFS_RE_CT 1
tTestDesc aLimits_IfndefsTests[] = {
- { TT_NEGREP, zLimits_IfndefsBypass0, (regex_t*)NULL }, };
+ { TT_NEGREP, zLimits_IfndefsBypass0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Limits_Ifndefs
*/
const char* apzLimits_IfndefsPatch[] = { "sed",
- "-e" "/[ \t]FLT_MIN[ \t]/i\\\n"
+ "-e", "/[ \t]FLT_MIN[ \t]/i\\\n"
"#ifndef FLT_MIN\n",
- "-e" "/[ \t]FLT_MIN[ \t]/a\\\n"
+ "-e", "/[ \t]FLT_MIN[ \t]/a\\\n"
"#endif\n",
- "-e" "/[ \t]FLT_MAX[ \t]/i\\\n"
+ "-e", "/[ \t]FLT_MAX[ \t]/i\\\n"
"#ifndef FLT_MAX\n",
- "-e" "/[ \t]FLT_MAX[ \t]/a\\\n"
+ "-e", "/[ \t]FLT_MAX[ \t]/a\\\n"
"#endif\n",
- "-e" "/[ \t]FLT_DIG[ \t]/i\\\n"
+ "-e", "/[ \t]FLT_DIG[ \t]/i\\\n"
"#ifndef FLT_DIG\n",
- "-e" "/[ \t]FLT_DIG[ \t]/a\\\n"
+ "-e", "/[ \t]FLT_DIG[ \t]/a\\\n"
"#endif\n",
- "-e" "/[ \t]DBL_MIN[ \t]/i\\\n"
+ "-e", "/[ \t]DBL_MIN[ \t]/i\\\n"
"#ifndef DBL_MIN\n",
- "-e" "/[ \t]DBL_MIN[ \t]/a\\\n"
+ "-e", "/[ \t]DBL_MIN[ \t]/a\\\n"
"#endif\n",
- "-e" "/[ \t]DBL_MAX[ \t]/i\\\n"
+ "-e", "/[ \t]DBL_MAX[ \t]/i\\\n"
"#ifndef DBL_MAX\n",
- "-e" "/[ \t]DBL_MAX[ \t]/a\\\n"
+ "-e", "/[ \t]DBL_MAX[ \t]/a\\\n"
"#endif\n",
- "-e" "/[ \t]DBL_DIG[ \t]/i\\\n"
+ "-e", "/[ \t]DBL_DIG[ \t]/i\\\n"
"#ifndef DBL_DIG\n",
- "-e" "/[ \t]DBL_DIG[ \t]/a\\\n"
+ "-e", "/[ \t]DBL_DIG[ \t]/a\\\n"
"#endif\n",
- "-e" "/^\\(\\/\\*#define\tHUGE_VAL\t3\\.[0-9e+]* *\\)\\/\\*/s//\\1/",
+ "-e", "/^\\(\\/\\*#define\tHUGE_VAL\t3\\.[0-9e+]* *\\)\\/\\*/s//\\1/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzLynx_Void_IntMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zLynx_Void_IntSelect0[] =
"#[ \t]*define[ \t]+void[ \t]+int";
#define LYNX_VOID_INT_TEST_CT 1
+#define LYNX_VOID_INT_RE_CT 1
tTestDesc aLynx_Void_IntTests[] = {
- { TT_EGREP, zLynx_Void_IntSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zLynx_Void_IntSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Lynx_Void_Int
*/
const char* apzLynx_Void_IntPatch[] = { "sed",
- "-e" "/#[ \t]*define[ \t][ \t]*void[ \t]int/d",
+ "-e", "/#[ \t]*define[ \t][ \t]*void[ \t]int/d",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzLynxos_Fcntl_ProtoMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zLynxos_Fcntl_ProtoSelect0[] =
"fcntl.*\\(int, int, int\\)";
#define LYNXOS_FCNTL_PROTO_TEST_CT 1
+#define LYNXOS_FCNTL_PROTO_RE_CT 1
tTestDesc aLynxos_Fcntl_ProtoTests[] = {
- { TT_EGREP, zLynxos_Fcntl_ProtoSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zLynxos_Fcntl_ProtoSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Lynxos_Fcntl_Proto
*/
const char* apzLynxos_Fcntl_ProtoPatch[] = { "sed",
- "-e" "s/\\(fcntl.*(int, int, \\)int)/\\1...)/",
+ "-e", "s/\\(fcntl.*(int, int, \\)int)/\\1...)/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
"m88k-motorola-sysv3*",
(const char*)NULL };
#define M88K_BAD_HYPOT_OPT_TEST_CT 0
+#define M88K_BAD_HYPOT_OPT_RE_CT 0
#define aM88k_Bad_Hypot_OptTests (tTestDesc*)NULL
/*
* Fix Command Arguments for M88k_Bad_Hypot_Opt
*/
const char* apzM88k_Bad_Hypot_OptPatch[] = { "sed",
- "-e" "s/extern double floor(), ceil(), fmod(), fabs();/extern double floor(), ceil(), fmod(), fabs _PARAMS((double));/",
- "-e" "/^extern double hypot();$/a\\\n"
+ "-e", "s/extern double floor(), ceil(), fmod(), fabs();/extern double floor(), ceil(), fmod(), fabs _PARAMS((double));/",
+ "-e", "/^extern double hypot();$/a\\\n"
"\\/* Workaround a stupid Motorola optimization if one\\\n"
" of x or y is 0.0 and the other is negative! *\\/\\\n"
"#ifdef __STDC__\\\n"
(const char*)NULL };
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zM88k_Bad_S_IfSelect0[] =
"#define[ \t]+S_IS[A-Z]*(m)[ \t]";
#define M88K_BAD_S_IF_TEST_CT 1
+#define M88K_BAD_S_IF_RE_CT 1
tTestDesc aM88k_Bad_S_IfTests[] = {
- { TT_EGREP, zM88k_Bad_S_IfSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zM88k_Bad_S_IfSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for M88k_Bad_S_If
*/
const char* apzM88k_Bad_S_IfPatch[] = { "sed",
- "-e" "s/^\\(#define[ \t]*S_IS[A-Z]*(m)\\)[ \t]*(m[ \t]*&[ \t]*\\(S_IF[A-Z][A-Z][A-Z][A-Z]*\\)[ \t]*)/\\1 (((m)\\&S_IFMT)==\\2)/",
- "-e" "s/^\\(#define[ \t]*S_IS[A-Z]*(m)\\)[ \t]*(m[ \t]*&[ \t]*\\(0[0-9]*\\)[ \t]*)/\\1 (((m)\\&S_IFMT)==\\2)/",
+ "-e", "s/^\\(#define[ \t]*S_IS[A-Z]*(m)\\)[ \t]*(m[ \t]*&[ \t]*\\(S_IF[A-Z][A-Z][A-Z][A-Z]*\\)[ \t]*)/\\1 (((m)\\&S_IFMT)==\\2)/",
+ "-e", "s/^\\(#define[ \t]*S_IS[A-Z]*(m)\\)[ \t]*(m[ \t]*&[ \t]*\\(0[0-9]*\\)[ \t]*)/\\1 (((m)\\&S_IFMT)==\\2)/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
(const char*)NULL };
/*
- * content bypass pattern
+ * content bypass pattern - skip fix if pattern found
*/
tSCC zM88k_Multi_InclBypass0[] =
"#ifndef";
#define M88K_MULTI_INCL_TEST_CT 1
+#define M88K_MULTI_INCL_RE_CT 1
tTestDesc aM88k_Multi_InclTests[] = {
- { TT_NEGREP, zM88k_Multi_InclBypass0, (regex_t*)NULL }, };
+ { TT_NEGREP, zM88k_Multi_InclBypass0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for M88k_Multi_Incl
#define apzMachine_NameMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
+ * This is a special pattern that not all egrep commands
+ * are capable of coping with. We use the GNU library, tho :)
*/
tSCC zMachine_NameSelect0[] =
- "^#[ \t]*(if|elif).*[^a-zA-Z0-9_](M32|_*(MIPSE[LB]|SYSTYPE_[A-Z0-9]|[Rr][34]000|host_mips|i386|mips)($|[^a-zA-Z0-9_])|bsd4|is68k|m[68]8k|mc680|news|ns32000|pdp11|pyr|sel|sony_news|sparc|sun|tahoe|tower|u370|u3b|unix|vax)";
+ "^#[ \t]*(if|elif).*[^a-zA-Z0-9_](M32|_*MIPSE[LB]|_*SYSTYPE_[A-Z0-9]|_*[Rr][34]000|_*host_mips|_*i386|_*mips|bsd4|is68k|m[68]8k|mc680|news|ns32000|pdp11|pyr|sel|sony_news|sparc|sun|tahoe|tower|u370|u3b|unix|vax)";
#define MACHINE_NAME_TEST_CT 1
+#define MACHINE_NAME_RE_CT 1
tTestDesc aMachine_NameTests[] = {
- { TT_EGREP, zMachine_NameSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zMachine_NameSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Machine_Name
*/
const char* apzMachine_NamePatch[] = { "sed",
- "-e" ":loop\n"
+ "-e", ":loop\n"
"/\\\\$/N\n"
"s/\\\\$/\\\\+++fixinc_eol+++/\n"
"/\\\\$/b loop\n"
#define apzMath_ExceptionMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zMath_ExceptionSelect0[] =
"struct exception";
#define MATH_EXCEPTION_TEST_CT 1
+#define MATH_EXCEPTION_RE_CT 1
tTestDesc aMath_ExceptionTests[] = {
- { TT_EGREP, zMath_ExceptionSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zMath_ExceptionSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Math_Exception
*/
const char* apzMath_ExceptionPatch[] = { "sed",
- "-e" "/struct exception/i\\\n"
+ "-e", "/struct exception/i\\\n"
"#ifdef __cplusplus\\\n"
"#define exception __math_exception\\\n"
"#endif\n",
- "-e" "/struct exception/a\\\n"
+ "-e", "/struct exception/a\\\n"
"#ifdef __cplusplus\\\n"
"#undef exception\\\n"
"#endif\n",
- "-e" "/matherr/i\\\n"
+ "-e", "/matherr/i\\\n"
"#ifdef __cplusplus\\\n"
"#define exception __math_exception\\\n"
"#endif\n",
- "-e" "/matherr/a\\\n"
+ "-e", "/matherr/a\\\n"
"#ifdef __cplusplus\\\n"
"#undef exception\\\n"
"#endif\n",
*/
#define apzMath_Gcc_IfndefsMachs (const char**)NULL
#define MATH_GCC_IFNDEFS_TEST_CT 0
+#define MATH_GCC_IFNDEFS_RE_CT 0
#define aMath_Gcc_IfndefsTests (tTestDesc*)NULL
/*
*/
#define apzNested_CommentMachs (const char**)NULL
#define NESTED_COMMENT_TEST_CT 0
+#define NESTED_COMMENT_RE_CT 0
#define aNested_CommentTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Nested_Comment
*/
const char* apzNested_CommentPatch[] = { "sed",
- "-e" "s@^\\(/\\*.*rpc/auth_des.h>.*\\)/\\*@\\1*/ /*@",
+ "-e", "s@^\\(/\\*.*rpc/auth_des.h>.*\\)/\\*@\\1*/ /*@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzNews_Os_RecursionMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zNews_Os_RecursionSelect0[] =
"#include <stdlib.h>";
#define NEWS_OS_RECURSION_TEST_CT 1
+#define NEWS_OS_RECURSION_RE_CT 1
tTestDesc aNews_Os_RecursionTests[] = {
- { TT_EGREP, zNews_Os_RecursionSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zNews_Os_RecursionSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for News_Os_Recursion
*/
const char* apzNews_Os_RecursionPatch[] = { "sed",
- "-e" "/^#include <stdlib.h>/i\\\n"
+ "-e", "/^#include <stdlib.h>/i\\\n"
"#ifdef BOGUS_RECURSION\n",
- "-e" "/^#include <stdlib.h>/a\\\n"
+ "-e", "/^#include <stdlib.h>/a\\\n"
"#endif\n",
(char*)NULL };
#define apzNext_Math_PrefixMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zNext_Math_PrefixSelect0[] =
"^extern.*double.*__const__.*";
#define NEXT_MATH_PREFIX_TEST_CT 1
+#define NEXT_MATH_PREFIX_RE_CT 1
tTestDesc aNext_Math_PrefixTests[] = {
- { TT_EGREP, zNext_Math_PrefixSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zNext_Math_PrefixSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Next_Math_Prefix
*/
const char* apzNext_Math_PrefixPatch[] = { "sed",
- "-e" "/^extern.*double.*__const__.*sqrt(/s/__const__//",
- "-e" "/^extern.*double.*__const__.*fabs(/s/__const__//",
- "-e" "/^extern.*double.*__const__.*cos(/s/__const__//",
- "-e" "/^extern.*double.*__const__.*hypot(/s/__const__//",
- "-e" "/^extern.*double.*__const__.*sin(/s/__const__//",
+ "-e", "/^extern.*double.*__const__.*sqrt(/s/__const__//",
+ "-e", "/^extern.*double.*__const__.*fabs(/s/__const__//",
+ "-e", "/^extern.*double.*__const__.*cos(/s/__const__//",
+ "-e", "/^extern.*double.*__const__.*hypot(/s/__const__//",
+ "-e", "/^extern.*double.*__const__.*sin(/s/__const__//",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzNext_TemplateMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zNext_TemplateSelect0[] =
"template";
#define NEXT_TEMPLATE_TEST_CT 1
+#define NEXT_TEMPLATE_RE_CT 1
tTestDesc aNext_TemplateTests[] = {
- { TT_EGREP, zNext_TemplateSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zNext_TemplateSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Next_Template
*/
const char* apzNext_TemplatePatch[] = { "sed",
- "-e" "/\\(.*template\\)/s/template//",
- "-e" "/extern.*volatile.*void.*abort/s/volatile//",
+ "-e", "/\\(.*template\\)/s/template//",
+ "-e", "/extern.*volatile.*void.*abort/s/volatile//",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzNext_VolitileMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zNext_VolitileSelect0[] =
"volatile";
#define NEXT_VOLITILE_TEST_CT 1
+#define NEXT_VOLITILE_RE_CT 1
tTestDesc aNext_VolitileTests[] = {
- { TT_EGREP, zNext_VolitileSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zNext_VolitileSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Next_Volitile
*/
const char* apzNext_VolitilePatch[] = { "sed",
- "-e" "/extern.*volatile.*void.*exit/s/volatile//",
- "-e" "/extern.*volatile.*void.*abort/s/volatile//",
+ "-e", "/extern.*volatile.*void.*exit/s/volatile//",
+ "-e", "/extern.*volatile.*void.*abort/s/volatile//",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzNext_Wait_UnionMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zNext_Wait_UnionSelect0[] =
"wait\\(union wait";
#define NEXT_WAIT_UNION_TEST_CT 1
+#define NEXT_WAIT_UNION_RE_CT 1
tTestDesc aNext_Wait_UnionTests[] = {
- { TT_EGREP, zNext_Wait_UnionSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zNext_Wait_UnionSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Next_Wait_Union
*/
const char* apzNext_Wait_UnionPatch[] = { "sed",
- "-e" "s@wait(union wait@wait(void@",
+ "-e", "s@wait(union wait@wait(void@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*/
#define apzNodeent_SyntaxMachs (const char**)NULL
#define NODEENT_SYNTAX_TEST_CT 0
+#define NODEENT_SYNTAX_RE_CT 0
#define aNodeent_SyntaxTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Nodeent_Syntax
*/
const char* apzNodeent_SyntaxPatch[] = { "sed",
- "-e" "s/char.*na_addr *$/char *na_addr;/",
+ "-e", "s/char.*na_addr *$/char *na_addr;/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzOsf_Namespace_AMachs (const char**)NULL
/*
- * content test pattern. A shell will deal with it later.
+ * perform the 'test' shell command - do fix on success
*/
tSCC zOsf_Namespace_ATest0[] =
" -r reg_types.h";
" -z \"`grep __regex_t regex.h`\"";
#define OSF_NAMESPACE_A_TEST_CT 4
+#define OSF_NAMESPACE_A_RE_CT 0
tTestDesc aOsf_Namespace_ATests[] = {
- { TT_TEST, zOsf_Namespace_ATest0, 0 /* unused */ },
- { TT_TEST, zOsf_Namespace_ATest1, 0 /* unused */ },
- { TT_TEST, zOsf_Namespace_ATest2, 0 /* unused */ },
- { TT_TEST, zOsf_Namespace_ATest3, 0 /* unused */ }, };
+ { TT_TEST, zOsf_Namespace_ATest0, 0 /* unused */ },
+ { TT_TEST, zOsf_Namespace_ATest1, 0 /* unused */ },
+ { TT_TEST, zOsf_Namespace_ATest2, 0 /* unused */ },
+ { TT_TEST, zOsf_Namespace_ATest3, 0 /* unused */ }, };
/*
* Fix Command Arguments for Osf_Namespace_A
*/
const char* apzOsf_Namespace_APatch[] = { "sed",
- "-e" "s/regex_t/__regex_t/g",
- "-e" "s/regoff_t/__regoff_t/g",
- "-e" "s/regmatch_t/__regmatch_t/g",
+ "-e", "s/regex_t/__regex_t/g",
+ "-e", "s/regoff_t/__regoff_t/g",
+ "-e", "s/regmatch_t/__regmatch_t/g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzOsf_Namespace_BMachs (const char**)NULL
/*
- * content test pattern. A shell will deal with it later.
+ * perform the 'test' shell command - do fix on success
*/
tSCC zOsf_Namespace_BTest0[] =
" -r reg_types.h";
" -z \"`grep __regex_t regex.h`\"";
#define OSF_NAMESPACE_B_TEST_CT 4
+#define OSF_NAMESPACE_B_RE_CT 0
tTestDesc aOsf_Namespace_BTests[] = {
- { TT_TEST, zOsf_Namespace_BTest0, 0 /* unused */ },
- { TT_TEST, zOsf_Namespace_BTest1, 0 /* unused */ },
- { TT_TEST, zOsf_Namespace_BTest2, 0 /* unused */ },
- { TT_TEST, zOsf_Namespace_BTest3, 0 /* unused */ }, };
+ { TT_TEST, zOsf_Namespace_BTest0, 0 /* unused */ },
+ { TT_TEST, zOsf_Namespace_BTest1, 0 /* unused */ },
+ { TT_TEST, zOsf_Namespace_BTest2, 0 /* unused */ },
+ { TT_TEST, zOsf_Namespace_BTest3, 0 /* unused */ }, };
/*
* Fix Command Arguments for Osf_Namespace_B
*/
const char* apzOsf_Namespace_BPatch[] = { "sed",
- "-e" "/#include <reg_types.h>/a\\\n"
+ "-e", "/#include <reg_types.h>/a\\\n"
"typedef __regex_t\tregex_t;\\\n"
"typedef __regoff_t\tregoff_t;\\\n"
"typedef __regmatch_t\tregmatch_t;\n",
#define apzPthread_Page_SizeMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zPthread_Page_SizeSelect0[] =
"^int __page_size";
#define PTHREAD_PAGE_SIZE_TEST_CT 1
+#define PTHREAD_PAGE_SIZE_RE_CT 1
tTestDesc aPthread_Page_SizeTests[] = {
- { TT_EGREP, zPthread_Page_SizeSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zPthread_Page_SizeSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Pthread_Page_Size
*/
const char* apzPthread_Page_SizePatch[] = { "sed",
- "-e" "s/^int __page_size/extern int __page_size/",
+ "-e", "s/^int __page_size/extern int __page_size/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzRs6000_DoubleMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zRs6000_DoubleSelect0[] =
"[^a-zA-Z_]class\\(";
#define RS6000_DOUBLE_TEST_CT 1
+#define RS6000_DOUBLE_RE_CT 1
tTestDesc aRs6000_DoubleTests[] = {
- { TT_EGREP, zRs6000_DoubleSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zRs6000_DoubleSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Rs6000_Double
*/
const char* apzRs6000_DoublePatch[] = { "sed",
- "-e" "/class[(]/i\\\n"
+ "-e", "/class[(]/i\\\n"
"#ifndef __cplusplus\n",
- "-e" "/class[(]/a\\\n"
+ "-e", "/class[(]/a\\\n"
"#endif\n",
(char*)NULL };
#define apzRs6000_FchmodMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zRs6000_FchmodSelect0[] =
"fchmod\\(char";
#define RS6000_FCHMOD_TEST_CT 1
+#define RS6000_FCHMOD_RE_CT 1
tTestDesc aRs6000_FchmodTests[] = {
- { TT_EGREP, zRs6000_FchmodSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zRs6000_FchmodSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Rs6000_Fchmod
*/
const char* apzRs6000_FchmodPatch[] = { "sed",
- "-e" "s/fchmod(char \\*/fchmod(int/",
+ "-e", "s/fchmod(char \\*/fchmod(int/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*/
#define apzRs6000_ParamMachs (const char**)NULL
#define RS6000_PARAM_TEST_CT 0
+#define RS6000_PARAM_RE_CT 0
#define aRs6000_ParamTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Rs6000_Param
*/
const char* apzRs6000_ParamPatch[] = { "sed",
- "-e" "s@rename(const char \\*old, const char \\*new)@rename(const char *_old, const char *_new)@",
+ "-e", "s@rename(const char \\*old, const char \\*new)@rename(const char *_old, const char *_new)@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzSony_IncludeMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zSony_IncludeSelect0[] =
"\"\\.\\./machine/endian.h\"";
#define SONY_INCLUDE_TEST_CT 1
+#define SONY_INCLUDE_RE_CT 1
tTestDesc aSony_IncludeTests[] = {
- { TT_EGREP, zSony_IncludeSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zSony_IncludeSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Sony_Include
*/
const char* apzSony_IncludePatch[] = { "sed",
- "-e" "s@\"../machine/endian.h\"@<machine/endian.h>@",
+ "-e", "s@\"../machine/endian.h\"@<machine/endian.h>@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzStatsswtchMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zStatsswtchSelect0[] =
"boottime$";
#define STATSSWTCH_TEST_CT 1
+#define STATSSWTCH_RE_CT 1
tTestDesc aStatsswtchTests[] = {
- { TT_EGREP, zStatsswtchSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zStatsswtchSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Statsswtch
*/
const char* apzStatsswtchPatch[] = { "sed",
- "-e" "s/boottime$/boottime;/",
+ "-e", "s/boottime$/boottime;/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*/
#define apzStdio_Va_ListMachs (const char**)NULL
#define STDIO_VA_LIST_TEST_CT 0
+#define STDIO_VA_LIST_RE_CT 0
#define aStdio_Va_ListTests (tTestDesc*)NULL
/*
#define apzSun_Bogus_IfdefMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zSun_Bogus_IfdefSelect0[] =
"#ifdef __i386__ || __vax__";
#define SUN_BOGUS_IFDEF_TEST_CT 1
+#define SUN_BOGUS_IFDEF_RE_CT 1
tTestDesc aSun_Bogus_IfdefTests[] = {
- { TT_EGREP, zSun_Bogus_IfdefSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zSun_Bogus_IfdefSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Sun_Bogus_Ifdef
*/
const char* apzSun_Bogus_IfdefPatch[] = { "sed",
- "-e" "s/\\#ifdef __i386__ || __vax__/\\#if __i386__ || __vax__/g",
+ "-e", "s/\\#ifdef __i386__ || __vax__/\\#if __i386__ || __vax__/g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzSun_Bogus_Ifdef_Sun4cMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zSun_Bogus_Ifdef_Sun4cSelect0[] =
"#ifdef __i386__ || __sun4c__";
#define SUN_BOGUS_IFDEF_SUN4C_TEST_CT 1
+#define SUN_BOGUS_IFDEF_SUN4C_RE_CT 1
tTestDesc aSun_Bogus_Ifdef_Sun4cTests[] = {
- { TT_EGREP, zSun_Bogus_Ifdef_Sun4cSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zSun_Bogus_Ifdef_Sun4cSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Sun_Bogus_Ifdef_Sun4c
*/
const char* apzSun_Bogus_Ifdef_Sun4cPatch[] = { "sed",
- "-e" "s/\\#ifdef __i386__ || __sun4c__/\\#if __i386__ || __sun4c__/g",
+ "-e", "s/\\#ifdef __i386__ || __sun4c__/\\#if __i386__ || __sun4c__/g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzSun_CatmacroMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zSun_CatmacroSelect0[] =
"^#define[ \t]+CAT(a,b)";
#define SUN_CATMACRO_TEST_CT 1
+#define SUN_CATMACRO_RE_CT 1
tTestDesc aSun_CatmacroTests[] = {
- { TT_EGREP, zSun_CatmacroSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zSun_CatmacroSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Sun_Catmacro
*/
const char* apzSun_CatmacroPatch[] = { "sed",
- "-e" "/^#define[ \t]CAT(a,b)/ i\\\n"
+ "-e", "/^#define[ \t]CAT(a,b)/ i\\\n"
"#ifdef __STDC__ \\\n"
"#define CAT(a,b) a##b\\\n"
"#else\n",
- "-e" "/^#define[ \t]CAT(a,b)/ a\\\n"
+ "-e", "/^#define[ \t]CAT(a,b)/ a\\\n"
"#endif\n",
(char*)NULL };
*/
#define apzSun_MallocMachs (const char**)NULL
#define SUN_MALLOC_TEST_CT 0
+#define SUN_MALLOC_RE_CT 0
#define aSun_MallocTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Sun_Malloc
*/
const char* apzSun_MallocPatch[] = { "sed",
- "-e" "s/typedef[ \t]char \\*\tmalloc_t/typedef void \\*\tmalloc_t/g",
- "-e" "s/int[ \t][ \t]*free/void\tfree/g",
- "-e" "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g",
- "-e" "s/char\\([ \t]*\\*[ \t]*realloc\\)/void\\1/g",
+ "-e", "s/typedef[ \t]char \\*\tmalloc_t/typedef void \\*\tmalloc_t/g",
+ "-e", "s/int[ \t][ \t]*free/void\tfree/g",
+ "-e", "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g",
+ "-e", "s/char\\([ \t]*\\*[ \t]*realloc\\)/void\\1/g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzSun_MemcpyMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zSun_MemcpySelect0[] =
"/\\*\t@\\(#\\)(head/memory.h\t50.1\t |memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2\t)\\*/";
#define SUN_MEMCPY_TEST_CT 1
+#define SUN_MEMCPY_RE_CT 1
tTestDesc aSun_MemcpyTests[] = {
- { TT_EGREP, zSun_MemcpySelect0, (regex_t*)NULL } };
+ { TT_EGREP, zSun_MemcpySelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Sun_Memcpy
*/
const char* apzSun_MemcpyPatch[] = { "sed",
- "-e" "1i\\\n"
+ "-e", "1i\\\n"
"/* This file was generated by fixincludes */\\\n"
"#ifndef __memory_h__\\\n"
"#define __memory_h__\\\n"
"extern int memcmp();\\\n"
"\\\n"
"#endif /* __memory_h__ */\n",
- "-e" "1,$d",
+ "-e", "1,$d",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzSun_Rusers_SemiMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zSun_Rusers_SemiSelect0[] =
"_cnt$";
#define SUN_RUSERS_SEMI_TEST_CT 1
+#define SUN_RUSERS_SEMI_RE_CT 1
tTestDesc aSun_Rusers_SemiTests[] = {
- { TT_EGREP, zSun_Rusers_SemiSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zSun_Rusers_SemiSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Sun_Rusers_Semi
*/
const char* apzSun_Rusers_SemiPatch[] = { "sed",
- "-e" "/^struct/,/^};/s/_cnt$/_cnt;/",
+ "-e", "/^struct/,/^};/s/_cnt$/_cnt;/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzSun_SignalMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zSun_SignalSelect0[] =
"^void\t\\(\\*signal\\(\\)\\)\\(\\);";
#define SUN_SIGNAL_TEST_CT 1
+#define SUN_SIGNAL_RE_CT 1
tTestDesc aSun_SignalTests[] = {
- { TT_EGREP, zSun_SignalSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zSun_SignalSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Sun_Signal
*/
const char* apzSun_SignalPatch[] = { "sed",
- "-e" "/^void\t(\\*signal())();$/i\\\n"
+ "-e", "/^void\t(\\*signal())();$/i\\\n"
"#ifdef __cplusplus\\\n"
"void\t(*signal(...))(...);\\\n"
"#else\n",
- "-e" "/^void\t(\\*signal())();$/a\\\n"
+ "-e", "/^void\t(\\*signal())();$/a\\\n"
"#endif\n",
(char*)NULL };
(const char*)NULL };
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zSun_Auth_ProtoSelect0[] =
"\\(\\*[a-z][a-z_]*\\)\\(\\)";
/*
- * content bypass pattern
+ * content bypass pattern - skip fix if pattern found
*/
tSCC zSun_Auth_ProtoBypass0[] =
"\\(\\*[a-z][a-z_]*\\)\\([ \t]*[a-zA-Z.].*\\)";
#define SUN_AUTH_PROTO_TEST_CT 2
+#define SUN_AUTH_PROTO_RE_CT 2
tTestDesc aSun_Auth_ProtoTests[] = {
- { TT_NEGREP, zSun_Auth_ProtoBypass0, (regex_t*)NULL },
- { TT_EGREP, zSun_Auth_ProtoSelect0, (regex_t*)NULL } };
+ { TT_NEGREP, zSun_Auth_ProtoBypass0, (regex_t*)NULL },
+ { TT_EGREP, zSun_Auth_ProtoSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Sun_Auth_Proto
*/
const char* apzSun_Auth_ProtoPatch[] = { "sed",
- "-e" "s/^\\(.*(\\*[a-z][a-z_]*)(\\)\\();.*\\)/\\\n"
+ "-e", "s/^\\(.*(\\*[a-z][a-z_]*)(\\)\\();.*\\)/\\\n"
"#ifdef __cplusplus\\\n"
"\\1...\\2\\\n"
"#else\\\n"
*/
#define apzSunos_Matherr_DeclMachs (const char**)NULL
#define SUNOS_MATHERR_DECL_TEST_CT 0
+#define SUNOS_MATHERR_DECL_RE_CT 0
#define aSunos_Matherr_DeclTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Sunos_Matherr_Decl
*/
const char* apzSunos_Matherr_DeclPatch[] = { "sed",
- "-e" "/^struct exception/,$b",
- "-e" "/matherr/i\\\n"
+ "-e", "/^struct exception/,$b",
+ "-e", "/matherr/i\\\n"
"struct exception;\n",
(char*)NULL };
*/
#define apzSunos_StrlenMachs (const char**)NULL
#define SUNOS_STRLEN_TEST_CT 0
+#define SUNOS_STRLEN_RE_CT 0
#define aSunos_StrlenTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Sunos_Strlen
*/
const char* apzSunos_StrlenPatch[] = { "sed",
- "-e" "s/int[ \t]*strlen();/__SIZE_TYPE__ strlen();/",
+ "-e", "s/int[ \t]*strlen();/__SIZE_TYPE__ strlen();/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzSystypesMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zSystypesSelect0[] =
"typedef[ \t]+[a-z_][ \ta-z_]*[ \t](size|ptrdiff|wchar)_t";
#define SYSTYPES_TEST_CT 1
+#define SYSTYPES_RE_CT 1
tTestDesc aSystypesTests[] = {
- { TT_EGREP, zSystypesSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zSystypesSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Systypes
*/
const char* apzSystypesPatch[] = { "sed",
- "-e" "/^[ \t]*\\*[ \t]*typedef unsigned int size_t;/N",
- "-e" "s/^\\([ \t]*\\*[ \t]*typedef unsigned int size_t;\\n[ \t]*\\*\\/\\)/\\1\\\n"
+ "-e", "/^[ \t]*\\*[ \t]*typedef unsigned int size_t;/N",
+ "-e", "s/^\\([ \t]*\\*[ \t]*typedef unsigned int size_t;\\n[ \t]*\\*\\/\\)/\\1\\\n"
"#ifndef __SIZE_TYPE__\\\n"
"#define __SIZE_TYPE__ long unsigned int\\\n"
"#endif\\\n"
"typedef __SIZE_TYPE__ size_t;\\\n"
"/",
- "-e" "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/i\\\n"
+ "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/i\\\n"
"#ifndef __SIZE_TYPE__\\\n"
"#define __SIZE_TYPE__ long unsigned int\\\n"
"#endif\n",
- "-e" "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/typedef __SIZE_TYPE__ size_t/",
- "-e" "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/i\\\n"
+ "-e", "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/typedef __SIZE_TYPE__ size_t/",
+ "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/i\\\n"
"#ifndef __PTRDIFF_TYPE__\\\n"
"#define __PTRDIFF_TYPE__ long int\\\n"
"#endif\n",
- "-e" "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/typedef __PTRDIFF_TYPE__ ptrdiff_t/",
- "-e" "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/i\\\n"
+ "-e", "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/typedef __PTRDIFF_TYPE__ ptrdiff_t/",
+ "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/i\\\n"
"#ifndef __WCHAR_TYPE__\\\n"
"#define __WCHAR_TYPE__ int\\\n"
"#endif\\\n"
"#ifndef __cplusplus\n",
- "-e" "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/a\\\n"
+ "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/a\\\n"
"#endif\n",
- "-e" "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/typedef __WCHAR_TYPE__ wchar_t/",
+ "-e", "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/typedef __WCHAR_TYPE__ wchar_t/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzSystypes_For_AixMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zSystypes_For_AixSelect0[] =
"typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t";
/*
- * content bypass pattern
+ * content bypass pattern - skip fix if pattern found
*/
tSCC zSystypes_For_AixBypass0[] =
"_GCC_SIZE_T";
#define SYSTYPES_FOR_AIX_TEST_CT 2
+#define SYSTYPES_FOR_AIX_RE_CT 2
tTestDesc aSystypes_For_AixTests[] = {
- { TT_NEGREP, zSystypes_For_AixBypass0, (regex_t*)NULL },
- { TT_EGREP, zSystypes_For_AixSelect0, (regex_t*)NULL } };
+ { TT_NEGREP, zSystypes_For_AixBypass0, (regex_t*)NULL },
+ { TT_EGREP, zSystypes_For_AixSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Systypes_For_Aix
*/
const char* apzSystypes_For_AixPatch[] = { "sed",
- "-e" "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/i\\\n"
+ "-e", "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/i\\\n"
"#ifndef _GCC_SIZE_T\\\n"
"#define _GCC_SIZE_T\n",
- "-e" "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/a\\\n"
+ "-e", "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/a\\\n"
"#endif\n",
(char*)NULL };
*/
#define apzSysv68_StringMachs (const char**)NULL
#define SYSV68_STRING_TEST_CT 0
+#define SYSV68_STRING_RE_CT 0
#define aSysv68_StringTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Sysv68_String
*/
const char* apzSysv68_StringPatch[] = { "sed",
- "-e" "s/extern[ \t]*int[ \t]*strlen();/extern unsigned int strlen();/",
- "-e" "s/extern[ \t]*int[ \t]*ffs[ \t]*(long);/extern int ffs(int);/",
- "-e" "s/strdup(char \\*s1);/strdup(const char *s1);/",
- "-e" "/^extern char$/N",
- "-e" "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/",
- "-e" "/^\tstrncmp(),$/N",
- "-e" "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n"
+ "-e", "s/extern[ \t]*int[ \t]*strlen();/extern unsigned int strlen();/",
+ "-e", "s/extern[ \t]*int[ \t]*ffs[ \t]*(long);/extern int ffs(int);/",
+ "-e", "s/strdup(char \\*s1);/strdup(const char *s1);/",
+ "-e", "/^extern char$/N",
+ "-e", "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/",
+ "-e", "/^\tstrncmp(),$/N",
+ "-e", "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n"
"extern unsigned int\\\n"
"\\2/",
- "-e" "/^extern int$/N",
- "-e" "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/",
+ "-e", "/^extern int$/N",
+ "-e", "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
"m88k-*sysv3*",
(const char*)NULL };
#define SYSZ_STDLIB_FOR_SUN_TEST_CT 0
+#define SYSZ_STDLIB_FOR_SUN_RE_CT 0
#define aSysz_Stdlib_For_SunTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Sysz_Stdlib_For_Sun
*/
const char* apzSysz_Stdlib_For_SunPatch[] = { "sed",
- "-e" "s/int\tabort/void\tabort/g",
- "-e" "s/int\tfree/void\tfree/g",
- "-e" "s/char[ \t]*\\*[ \t]*calloc/void \\*\tcalloc/g",
- "-e" "s/char[ \t]*\\*[ \t]*malloc/void \\*\tmalloc/g",
- "-e" "s/char[ \t]*\\*[ \t]*realloc/void \\*\trealloc/g",
- "-e" "s/int[ \t][ \t]*exit/void\texit/g",
- "-e" "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/i\\\n"
+ "-e", "s/int\tabort/void\tabort/g",
+ "-e", "s/int\tfree/void\tfree/g",
+ "-e", "s/char[ \t]*\\*[ \t]*calloc/void \\*\tcalloc/g",
+ "-e", "s/char[ \t]*\\*[ \t]*malloc/void \\*\tmalloc/g",
+ "-e", "s/char[ \t]*\\*[ \t]*realloc/void \\*\trealloc/g",
+ "-e", "s/int[ \t][ \t]*exit/void\texit/g",
+ "-e", "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/i\\\n"
"#ifndef _GCC_SIZE_T\\\n"
"#define _GCC_SIZE_T\n",
- "-e" "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/a\\\n"
+ "-e", "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/a\\\n"
"#endif\n",
(char*)NULL };
*/
#define apzSysz_Stdtypes_For_SunMachs (const char**)NULL
#define SYSZ_STDTYPES_FOR_SUN_TEST_CT 0
+#define SYSZ_STDTYPES_FOR_SUN_RE_CT 0
#define aSysz_Stdtypes_For_SunTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Sysz_Stdtypes_For_Sun
*/
const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed",
- "-e" "/[\t ]size_t.*;/i\\\n"
+ "-e", "/[\t ]size_t.*;/i\\\n"
"#ifndef _GCC_SIZE_T\\\n"
"#define _GCC_SIZE_T\n",
- "-e" "/[\t ]size_t.*;/a\\\n"
+ "-e", "/[\t ]size_t.*;/a\\\n"
"#endif\n",
- "-e" "/[\t ]ptrdiff_t.*;/i\\\n"
+ "-e", "/[\t ]ptrdiff_t.*;/i\\\n"
"#ifndef _GCC_PTRDIFF_T\\\n"
"#define _GCC_PTRDIFF_T\n",
- "-e" "/[\t ]ptrdiff_t.*;/a\\\n"
+ "-e", "/[\t ]ptrdiff_t.*;/a\\\n"
"#endif\n",
- "-e" "/[\t ]wchar_t.*;/i\\\n"
+ "-e", "/[\t ]wchar_t.*;/i\\\n"
"#ifndef _GCC_WCHAR_T\\\n"
"#define _GCC_WCHAR_T\n",
- "-e" "/[\t ]wchar_t.*;/a\\\n"
+ "-e", "/[\t ]wchar_t.*;/a\\\n"
"#endif\n",
(char*)NULL };
*/
#define apzTinfo_CplusplusMachs (const char**)NULL
#define TINFO_CPLUSPLUS_TEST_CT 0
+#define TINFO_CPLUSPLUS_RE_CT 0
#define aTinfo_CplusplusTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Tinfo_Cplusplus
*/
const char* apzTinfo_CplusplusPatch[] = { "sed",
- "-e" "s/[ \t]_cplusplus/ __cplusplus/",
+ "-e", "s/[ \t]_cplusplus/ __cplusplus/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzUltrix_Ansi_CompatMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zUltrix_Ansi_CompatSelect0[] =
"ULTRIX";
#define ULTRIX_ANSI_COMPAT_TEST_CT 1
+#define ULTRIX_ANSI_COMPAT_RE_CT 1
tTestDesc aUltrix_Ansi_CompatTests[] = {
- { TT_EGREP, zUltrix_Ansi_CompatSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zUltrix_Ansi_CompatSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Ultrix_Ansi_Compat
*/
const char* apzUltrix_Ansi_CompatPatch[] = { "sed",
- "-e" "1i\\\n"
+ "-e", "1i\\\n"
"/* This file intentionally left blank. */\n",
- "-e" "1,$d",
+ "-e", "1,$d",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzUltrix_Fix_FixprotoMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zUltrix_Fix_FixprotoSelect0[] =
"ULTRIX";
#define ULTRIX_FIX_FIXPROTO_TEST_CT 1
+#define ULTRIX_FIX_FIXPROTO_RE_CT 1
tTestDesc aUltrix_Fix_FixprotoTests[] = {
- { TT_EGREP, zUltrix_Fix_FixprotoSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zUltrix_Fix_FixprotoSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Ultrix_Fix_Fixproto
*/
const char* apzUltrix_Fix_FixprotoPatch[] = { "sed",
- "-e" "/^[ \t]*extern[ \t]*int[ \t]*uname();$/i\\\n"
+ "-e", "/^[ \t]*extern[ \t]*int[ \t]*uname();$/i\\\n"
"struct utsname;\n",
(char*)NULL };
*/
#define apzUltrix_Atof_ParamMachs (const char**)NULL
#define ULTRIX_ATOF_PARAM_TEST_CT 0
+#define ULTRIX_ATOF_PARAM_RE_CT 0
#define aUltrix_Atof_ParamTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Ultrix_Atof_Param
*/
const char* apzUltrix_Atof_ParamPatch[] = { "sed",
- "-e" "s@atof(\\([ \t]*char[ \t]*\\*[^)]*\\))@atof(const \\1)@",
- "-e" "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@",
- "-e" "s@inline double abs(double [a-z][a-z]*) {.*}@@",
- "-e" "s@inline int sqr(int [a-z][a-z]*) {.*}@@",
- "-e" "s@inline double sqr(double [a-z][a-z]*) {.*}@@",
+ "-e", "s@atof(\\([ \t]*char[ \t]*\\*[^)]*\\))@atof(const \\1)@",
+ "-e", "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@",
+ "-e", "s@inline double abs(double [a-z][a-z]*) {.*}@@",
+ "-e", "s@inline int sqr(int [a-z][a-z]*) {.*}@@",
+ "-e", "s@inline double sqr(double [a-z][a-z]*) {.*}@@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*/
#define apzUltrix_ConstMachs (const char**)NULL
#define ULTRIX_CONST_TEST_CT 0
+#define ULTRIX_CONST_RE_CT 0
#define aUltrix_ConstTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Ultrix_Const
*/
const char* apzUltrix_ConstPatch[] = { "sed",
- "-e" "s@perror( char \\*__s );@perror( const char *__s );@",
- "-e" "s@fputs( char \\*__s,@fputs( const char *__s,@",
- "-e" "s@fopen( char \\*__filename, char \\*__type );@fopen( const char *__filename, const char *__type );@",
- "-e" "s@fwrite( void \\*__ptr,@fwrite( const void *__ptr,@",
- "-e" "s@fscanf( FILE \\*__stream, char \\*__format,@fscanf( FILE *__stream, const char *__format,@",
- "-e" "s@scanf( char \\*__format,@scanf( const char *__format,@",
- "-e" "s@sscanf( char \\*__s, char \\*__format,@sscanf( const char *__s, const char *__format,@",
- "-e" "s@popen(char \\*, char \\*);@popen(const char *, const char *);@",
- "-e" "s@tempnam(char\\*,char\\*);@tempnam(const char*,const char*);@",
+ "-e", "s@perror( char \\*__s );@perror( const char *__s );@",
+ "-e", "s@fputs( char \\*__s,@fputs( const char *__s,@",
+ "-e", "s@fopen( char \\*__filename, char \\*__type );@fopen( const char *__filename, const char *__type );@",
+ "-e", "s@fwrite( void \\*__ptr,@fwrite( const void *__ptr,@",
+ "-e", "s@fscanf( FILE \\*__stream, char \\*__format,@fscanf( FILE *__stream, const char *__format,@",
+ "-e", "s@scanf( char \\*__format,@scanf( const char *__format,@",
+ "-e", "s@sscanf( char \\*__s, char \\*__format,@sscanf( const char *__s, const char *__format,@",
+ "-e", "s@popen(char \\*, char \\*);@popen(const char *, const char *);@",
+ "-e", "s@tempnam(char\\*,char\\*);@tempnam(const char*,const char*);@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzUltrix_IfdefMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zUltrix_IfdefSelect0[] =
"#ifdef KERNEL";
#define ULTRIX_IFDEF_TEST_CT 1
+#define ULTRIX_IFDEF_RE_CT 1
tTestDesc aUltrix_IfdefTests[] = {
- { TT_EGREP, zUltrix_IfdefSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zUltrix_IfdefSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Ultrix_Ifdef
*/
const char* apzUltrix_IfdefPatch[] = { "sed",
- "-e" "s/#ifdef KERNEL/#if defined(KERNEL)/",
+ "-e", "s/#ifdef KERNEL/#if defined(KERNEL)/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*/
#define apzUltrix_Nested_CmntMachs (const char**)NULL
#define ULTRIX_NESTED_CMNT_TEST_CT 0
+#define ULTRIX_NESTED_CMNT_RE_CT 0
#define aUltrix_Nested_CmntTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Ultrix_Nested_Cmnt
*/
const char* apzUltrix_Nested_CmntPatch[] = { "sed",
- "-e" "s@^\\( \\*\tint protocol; \\)/\\*@\\1*/ /*@",
+ "-e", "s@^\\( \\*\tint protocol; \\)/\\*@\\1*/ /*@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzUltrix_StaticMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zUltrix_StaticSelect0[] =
"#include \"r[34]_cpu";
#define ULTRIX_STATIC_TEST_CT 1
+#define ULTRIX_STATIC_RE_CT 1
tTestDesc aUltrix_StaticTests[] = {
- { TT_EGREP, zUltrix_StaticSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zUltrix_StaticSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Ultrix_Static
*/
const char* apzUltrix_StaticPatch[] = { "sed",
- "-e" "s/^static struct tlb_pid_state/struct tlb_pid_state/",
- "-e" "s/^#include \"r3_cpu\\.h\"$/#include <machine\\/r3_cpu\\.h>/",
- "-e" "s/^#include \"r4_cpu\\.h\"$/#include <machine\\/r4_cpu\\.h>/",
+ "-e", "s/^static struct tlb_pid_state/struct tlb_pid_state/",
+ "-e", "s/^#include \"r3_cpu\\.h\"$/#include <machine\\/r3_cpu\\.h>/",
+ "-e", "s/^#include \"r4_cpu\\.h\"$/#include <machine\\/r4_cpu\\.h>/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzUndefine_NullMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zUndefine_NullSelect0[] =
"^#[ \t]*define[ \t]*[ \t]NULL[ \t]";
/*
- * content bypass pattern
+ * content bypass pattern - skip fix if pattern found
*/
tSCC zUndefine_NullBypass0[] =
"#[ \t]*(ifn|un)def[ \t]*[ \t]NULL($|[ \t])";
#define UNDEFINE_NULL_TEST_CT 2
+#define UNDEFINE_NULL_RE_CT 2
tTestDesc aUndefine_NullTests[] = {
- { TT_NEGREP, zUndefine_NullBypass0, (regex_t*)NULL },
- { TT_EGREP, zUndefine_NullSelect0, (regex_t*)NULL } };
+ { TT_NEGREP, zUndefine_NullBypass0, (regex_t*)NULL },
+ { TT_EGREP, zUndefine_NullSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Undefine_Null
*/
const char* apzUndefine_NullPatch[] = { "sed",
- "-e" "/^#[ \t]*define[ \t][ \t]*NULL[ \t]/i\\\n"
+ "-e", "/^#[ \t]*define[ \t][ \t]*NULL[ \t]/i\\\n"
"#undef NULL\n",
(char*)NULL };
#define apzVa_I960_MacroMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zVa_I960_MacroSelect0[] =
"__(vsiz|vali|vpad|alignof__)";
#define VA_I960_MACRO_TEST_CT 1
+#define VA_I960_MACRO_RE_CT 1
tTestDesc aVa_I960_MacroTests[] = {
- { TT_EGREP, zVa_I960_MacroSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zVa_I960_MacroSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Va_I960_Macro
*/
const char* apzVa_I960_MacroPatch[] = { "sed",
- "-e" "s/__vsiz/__vxvsiz/",
- "-e" "s/__vali/__vxvali/",
- "-e" "s/__vpad/__vxvpad/",
- "-e" "s/__alignof__/__vxalignof__/",
+ "-e", "s/__vsiz/__vxvsiz/",
+ "-e", "s/__vali/__vxvali/",
+ "-e", "s/__vpad/__vxvpad/",
+ "-e", "s/__alignof__/__vxalignof__/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzVoid_NullMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zVoid_NullSelect0[] =
"#[ \t]*define[ \t][ \t]*NULL[ \t].*void";
#define VOID_NULL_TEST_CT 1
+#define VOID_NULL_RE_CT 1
tTestDesc aVoid_NullTests[] = {
- { TT_EGREP, zVoid_NullSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zVoid_NullSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Void_Null
*/
const char* apzVoid_NullPatch[] = { "sed",
- "-e" "s/^#[ \t]*define[ \t]*NULL[ \t]*((void[ \t]*\\*)0)/#define NULL 0/",
+ "-e", "s/^#[ \t]*define[ \t]*NULL[ \t]*((void[ \t]*\\*)0)/#define NULL 0/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzVxworks_Gcc_ProblemMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zVxworks_Gcc_ProblemSelect0[] =
"__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__";
#define VXWORKS_GCC_PROBLEM_TEST_CT 1
+#define VXWORKS_GCC_PROBLEM_RE_CT 1
tTestDesc aVxworks_Gcc_ProblemTests[] = {
- { TT_EGREP, zVxworks_Gcc_ProblemSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zVxworks_Gcc_ProblemSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Vxworks_Gcc_Problem
*/
const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
- "-e" "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/#if 1/",
- "-e" "/[ \t]size_t/i\\\n"
+ "-e", "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/#if 1/",
+ "-e", "/[ \t]size_t/i\\\n"
"#ifndef _GCC_SIZE_T\\\n"
"#define _GCC_SIZE_T\n",
- "-e" "/[ \t]size_t/a\\\n"
+ "-e", "/[ \t]size_t/a\\\n"
"#endif\n",
- "-e" "/[ \t]ptrdiff_t/i\\\n"
+ "-e", "/[ \t]ptrdiff_t/i\\\n"
"#ifndef _GCC_PTRDIFF_T\\\n"
"#define _GCC_PTRDIFF_T\n",
- "-e" "/[ \t]ptrdiff_t/a\\\n"
+ "-e", "/[ \t]ptrdiff_t/a\\\n"
"#endif\n",
- "-e" "/[ \t]wchar_t/i\\\n"
+ "-e", "/[ \t]wchar_t/i\\\n"
"#ifndef _GCC_WCHAR_T\\\n"
"#define _GCC_WCHAR_T\n",
- "-e" "/[ \t]wchar_t/a\\\n"
+ "-e", "/[ \t]wchar_t/a\\\n"
"#endif\n",
(char*)NULL };
#define apzVxworks_Needs_VxtypesMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zVxworks_Needs_VxtypesSelect0[] =
"uint_t[ \t][ \t]*_clocks_per_sec";
#define VXWORKS_NEEDS_VXTYPES_TEST_CT 1
+#define VXWORKS_NEEDS_VXTYPES_RE_CT 1
tTestDesc aVxworks_Needs_VxtypesTests[] = {
- { TT_EGREP, zVxworks_Needs_VxtypesSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zVxworks_Needs_VxtypesSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Vxworks_Needs_Vxtypes
*/
const char* apzVxworks_Needs_VxtypesPatch[] = { "sed",
- "-e" "s/uint_t/unsigned int/",
+ "-e", "s/uint_t/unsigned int/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzVxworks_Needs_VxworksMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zVxworks_Needs_VxworksSelect0[] =
"#[ \t]define[ \t][ \t]*__INCstath";
/*
- * content test pattern. A shell will deal with it later.
+ * perform the 'test' shell command - do fix on success
*/
tSCC zVxworks_Needs_VxworksTest0[] =
" -r types/vxTypesOld.h";
" -n \"`egrep ULONG $file`\"";
#define VXWORKS_NEEDS_VXWORKS_TEST_CT 4
+#define VXWORKS_NEEDS_VXWORKS_RE_CT 1
tTestDesc aVxworks_Needs_VxworksTests[] = {
- { TT_TEST, zVxworks_Needs_VxworksTest0, 0 /* unused */ },
- { TT_TEST, zVxworks_Needs_VxworksTest1, 0 /* unused */ },
- { TT_TEST, zVxworks_Needs_VxworksTest2, 0 /* unused */ },
- { TT_EGREP, zVxworks_Needs_VxworksSelect0, (regex_t*)NULL } };
+ { TT_TEST, zVxworks_Needs_VxworksTest0, 0 /* unused */ },
+ { TT_TEST, zVxworks_Needs_VxworksTest1, 0 /* unused */ },
+ { TT_TEST, zVxworks_Needs_VxworksTest2, 0 /* unused */ },
+ { TT_EGREP, zVxworks_Needs_VxworksSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Vxworks_Needs_Vxworks
*/
const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
- "-e" "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n"
+ "-e", "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n"
"#include <types/vxTypesOld.h>\n",
(char*)NULL };
#define apzVxworks_TimeMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zVxworks_TimeSelect0[] =
"VOIDFUNCPTR";
/*
- * content test pattern. A shell will deal with it later.
+ * perform the 'test' shell command - do fix on success
*/
tSCC zVxworks_TimeTest0[] =
" -r vxWorks.h";
#define VXWORKS_TIME_TEST_CT 2
+#define VXWORKS_TIME_RE_CT 1
tTestDesc aVxworks_TimeTests[] = {
- { TT_TEST, zVxworks_TimeTest0, 0 /* unused */ },
- { TT_EGREP, zVxworks_TimeSelect0, (regex_t*)NULL } };
+ { TT_TEST, zVxworks_TimeTest0, 0 /* unused */ },
+ { TT_EGREP, zVxworks_TimeSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Vxworks_Time
*/
const char* apzVxworks_TimePatch[] = { "sed",
- "-e" "/VOIDFUNCPTR/i\\\n"
+ "-e", "/VOIDFUNCPTR/i\\\n"
"#ifndef __gcc_VOIDFUNCPTR_defined\\\n"
"#ifdef __cplusplus\\\n"
"typedef void (*__gcc_VOIDFUNCPTR) (...);\\\n"
"#endif\\\n"
"#define __gcc_VOIDFUNCPTR_defined\\\n"
"#endif\n",
- "-e" "s/VOIDFUNCPTR/__gcc_VOIDFUNCPTR/g",
+ "-e", "s/VOIDFUNCPTR/__gcc_VOIDFUNCPTR/g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzX11_ClassMachs (const char**)NULL
/*
- * content bypass pattern
+ * content bypass pattern - skip fix if pattern found
*/
tSCC zX11_ClassBypass0[] =
"__cplusplus";
#define X11_CLASS_TEST_CT 1
+#define X11_CLASS_RE_CT 1
tTestDesc aX11_ClassTests[] = {
- { TT_NEGREP, zX11_ClassBypass0, (regex_t*)NULL }, };
+ { TT_NEGREP, zX11_ClassBypass0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for X11_Class
*/
const char* apzX11_ClassPatch[] = { "sed",
- "-e" "/char \\*class;/i\\\n"
+ "-e", "/char \\*class;/i\\\n"
"#ifdef __cplusplus\\\n"
"\tchar *c_class;\\\n"
"#else\n",
- "-e" "/char \\*class;/a\\\n"
+ "-e", "/char \\*class;/a\\\n"
"#endif\n",
(char*)NULL };
#define apzX11_Class_UsageMachs (const char**)NULL
/*
- * content bypass pattern
+ * content bypass pattern - skip fix if pattern found
*/
tSCC zX11_Class_UsageBypass0[] =
"__cplusplus";
#define X11_CLASS_USAGE_TEST_CT 1
+#define X11_CLASS_USAGE_RE_CT 1
tTestDesc aX11_Class_UsageTests[] = {
- { TT_NEGREP, zX11_Class_UsageBypass0, (regex_t*)NULL }, };
+ { TT_NEGREP, zX11_Class_UsageBypass0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for X11_Class_Usage
*/
const char* apzX11_Class_UsagePatch[] = { "sed",
- "-e" "s/ class[)]/ c_class)/g",
+ "-e", "s/ class[)]/ c_class)/g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#define apzX11_NewMachs (const char**)NULL
/*
- * content bypass pattern
+ * content bypass pattern - skip fix if pattern found
*/
tSCC zX11_NewBypass0[] =
"__cplusplus";
#define X11_NEW_TEST_CT 1
+#define X11_NEW_RE_CT 1
tTestDesc aX11_NewTests[] = {
- { TT_NEGREP, zX11_NewBypass0, (regex_t*)NULL }, };
+ { TT_NEGREP, zX11_NewBypass0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for X11_New
*/
const char* apzX11_NewPatch[] = { "sed",
- "-e" "/Widget\told, new;/i\\\n"
+ "-e", "/Widget\told, new;/i\\\n"
"#ifdef __cplusplus\\\n"
"\tWidget\told, c_new;\\\n"
"#else\n",
- "-e" "/Widget\told, new;/a\\\n"
+ "-e", "/Widget\told, new;/a\\\n"
"#endif\n",
- "-e" "s/Widget new,/Widget c_new,/g",
+ "-e", "s/Widget new,/Widget c_new,/g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*/
#define apzX11_SprintfMachs (const char**)NULL
#define X11_SPRINTF_TEST_CT 0
+#define X11_SPRINTF_RE_CT 0
#define aX11_SprintfTests (tTestDesc*)NULL
/*
* Fix Command Arguments for X11_Sprintf
*/
const char* apzX11_SprintfPatch[] = { "sed",
- "-e" "s,^extern char \\*\tsprintf();$,#ifndef __STDC__\\\n"
+ "-e", "s,^extern char \\*\tsprintf();$,#ifndef __STDC__\\\n"
"extern char *\tsprintf();\\\n"
"#endif /* !defined __STDC__ */,",
(char*)NULL };
#define apzZzz_Ki_IfaceMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zZzz_Ki_IfaceSelect0[] =
"These definitions are for HP Internal developers";
#define ZZZ_KI_IFACE_TEST_CT 1
+#define ZZZ_KI_IFACE_RE_CT 1
tTestDesc aZzz_Ki_IfaceTests[] = {
- { TT_EGREP, zZzz_Ki_IfaceSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zZzz_Ki_IfaceSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Zzz_Ki_Iface
#define apzZzz_KiMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zZzz_KiSelect0[] =
"11.00 HP-UX LP64";
#define ZZZ_KI_TEST_CT 1
+#define ZZZ_KI_RE_CT 1
tTestDesc aZzz_KiTests[] = {
- { TT_EGREP, zZzz_KiSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zZzz_KiSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Zzz_Ki
#define apzZzz_Ki_CallsMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zZzz_Ki_CallsSelect0[] =
"kthread_create_caller_t";
#define ZZZ_KI_CALLS_TEST_CT 1
+#define ZZZ_KI_CALLS_RE_CT 1
tTestDesc aZzz_Ki_CallsTests[] = {
- { TT_EGREP, zZzz_Ki_CallsSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zZzz_Ki_CallsSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Zzz_Ki_Calls
#define apzZzz_Ki_DefsMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zZzz_Ki_DefsSelect0[] =
"Kernel Instrumentation Definitions";
#define ZZZ_KI_DEFS_TEST_CT 1
+#define ZZZ_KI_DEFS_RE_CT 1
tTestDesc aZzz_Ki_DefsTests[] = {
- { TT_EGREP, zZzz_Ki_DefsSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zZzz_Ki_DefsSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Zzz_Ki_Defs
*/
#define apzZzz_Bad_FixesMachs (const char**)NULL
#define ZZZ_BAD_FIXES_TEST_CT 0
+#define ZZZ_BAD_FIXES_RE_CT 0
#define aZzz_Bad_FixesTests (tTestDesc*)NULL
/*
#define apzZzz_TimeMachs (const char**)NULL
/*
- * content selection pattern
+ * content selection pattern - do fix if pattern found
*/
tSCC zZzz_TimeSelect0[] =
"11.0 and later representation of ki time";
#define ZZZ_TIME_TEST_CT 1
+#define ZZZ_TIME_RE_CT 1
tTestDesc aZzz_TimeTests[] = {
- { TT_EGREP, zZzz_TimeSelect0, (regex_t*)NULL } };
+ { TT_EGREP, zZzz_TimeSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Zzz_Time
*/
#define REGEX_COUNT 75
#define FIX_COUNT 103
-tFixDesc fixDescList[ 103 ] = {
+tFixDesc fixDescList[ FIX_COUNT ] = {
{ zAix_SyswaitName, zAix_SyswaitList,
apzAix_SyswaitMachs, (regex_t*)NULL,
AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY,
projects / platform / upstream / gcc.git / commitdiff