* files which are fixed to work correctly with ANSI C and placed in a
* directory that GNU C will search.
*
- * This file contains 113 fixup descriptions.
+ * This file contains 115 fixup descriptions.
*
* See README-fixinc for more information.
*
- * inclhack copyright (c) 2000 The Free Software Foundation, Inc.
+ * inclhack copyright (c) 1998, 1999, 2000
+ * The Free Software Foundation, Inc.
*
* inclhack is free software.
*
* write to: The Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
- *
+ */
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Aaa_Ki_Iface fix
*/
#define AAA_KI_IFACE_FIXIDX 0
tSCC zAaa_Ki_IfaceName[] =
- "Aaa_Ki_Iface";
+ "AAA_ki_iface";
+
/*
* File name selection pattern
*/
*/
#define AAA_KI_FIXIDX 1
tSCC zAaa_KiName[] =
- "Aaa_Ki";
+ "AAA_ki";
+
/*
* File name selection pattern
*/
*/
#define AAA_KI_CALLS_FIXIDX 2
tSCC zAaa_Ki_CallsName[] =
- "Aaa_Ki_Calls";
+ "AAA_ki_calls";
+
/*
* File name selection pattern
*/
*/
#define AAA_KI_DEFS_FIXIDX 3
tSCC zAaa_Ki_DefsName[] =
- "Aaa_Ki_Defs";
+ "AAA_ki_defs";
+
/*
* File name selection pattern
*/
*/
#define AAA_BAD_FIXES_FIXIDX 4
tSCC zAaa_Bad_FixesName[] =
- "Aaa_Bad_Fixes";
+ "AAA_bad_fixes";
+
/*
* File name selection pattern
*/
*/
#define AAA_TIME_FIXIDX 5
tSCC zAaa_TimeName[] =
- "Aaa_Time";
+ "AAA_time";
+
/*
* File name selection pattern
*/
*/
#define AAB_DGUX_INT_VARARGS_FIXIDX 6
tSCC zAab_Dgux_Int_VarargsName[] =
- "Aab_Dgux_Int_Varargs";
+ "AAB_dgux_int_varargs";
+
/*
* File name selection pattern
*/
*/
#define AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX 7
tSCC zAab_Fd_Zero_Asm_Posix_Types_HName[] =
- "Aab_Fd_Zero_Asm_Posix_Types_H";
+ "AAB_fd_zero_asm_posix_types_h";
+
/*
* File name selection pattern
*/
*/
#define AAB_FD_ZERO_GNU_TYPES_H_FIXIDX 8
tSCC zAab_Fd_Zero_Gnu_Types_HName[] =
- "Aab_Fd_Zero_Gnu_Types_H";
+ "AAB_fd_zero_gnu_types_h";
+
/*
* File name selection pattern
*/
*/
#define AAB_FD_ZERO_SELECTBITS_H_FIXIDX 9
tSCC zAab_Fd_Zero_Selectbits_HName[] =
- "Aab_Fd_Zero_Selectbits_H";
+ "AAB_fd_zero_selectbits_h";
+
/*
* File name selection pattern
*/
*/
#define AAB_SUN_MEMCPY_FIXIDX 10
tSCC zAab_Sun_MemcpyName[] =
- "Aab_Sun_Memcpy";
+ "AAB_sun_memcpy";
+
/*
* File name selection pattern
*/
*/
#define AAB_SVR4_REPLACE_BYTEORDER_FIXIDX 11
tSCC zAab_Svr4_Replace_ByteorderName[] =
- "Aab_Svr4_Replace_Byteorder";
+ "AAB_svr4_replace_byteorder";
+
/*
* File name selection pattern
*/
*/
#define AAB_ULTRIX_ANSI_COMPAT_FIXIDX 12
tSCC zAab_Ultrix_Ansi_CompatName[] =
- "Aab_Ultrix_Ansi_Compat";
+ "AAB_ultrix_ansi_compat";
+
/*
* File name selection pattern
*/
*/
#define AIX_SYSWAIT_FIXIDX 13
tSCC zAix_SyswaitName[] =
- "Aix_Syswait";
+ "aix_syswait";
+
/*
* File name selection pattern
*/
*/
#define AIX_VOLATILE_FIXIDX 14
tSCC zAix_VolatileName[] =
- "Aix_Volatile";
+ "aix_volatile";
+
/*
* File name selection pattern
*/
*/
#define ALPHA_GETOPT_FIXIDX 15
tSCC zAlpha_GetoptName[] =
- "Alpha_Getopt";
+ "alpha_getopt";
+
/*
* File name selection pattern
*/
*/
#define ALPHA_PARENS_FIXIDX 16
tSCC zAlpha_ParensName[] =
- "Alpha_Parens";
+ "alpha_parens";
+
/*
* File name selection pattern
*/
*/
#define ALPHA_SBRK_FIXIDX 17
tSCC zAlpha_SbrkName[] =
- "Alpha_Sbrk";
+ "alpha_sbrk";
+
/*
* File name selection pattern
*/
*/
#define ARM_NORCROFT_HINT_FIXIDX 18
tSCC zArm_Norcroft_HintName[] =
- "Arm_Norcroft_Hint";
+ "arm_norcroft_hint";
+
/*
* File name selection pattern
*/
*/
#define ARM_WCHAR_FIXIDX 19
tSCC zArm_WcharName[] =
- "Arm_Wchar";
+ "arm_wchar";
+
/*
* File name selection pattern
*/
*/
#define AUX_ASM_FIXIDX 20
tSCC zAux_AsmName[] =
- "Aux_Asm";
+ "aux_asm";
+
/*
* File name selection pattern
*/
*/
#define AVOID_BOOL_FIXIDX 21
tSCC zAvoid_BoolName[] =
- "Avoid_Bool";
+ "avoid_bool";
+
/*
* File name selection pattern
*/
*/
#define BAD_STRUCT_TERM_FIXIDX 22
tSCC zBad_Struct_TermName[] =
- "Bad_Struct_Term";
+ "bad_struct_term";
+
/*
* File name selection pattern
*/
*/
#define BADQUOTE_FIXIDX 23
tSCC zBadquoteName[] =
- "Badquote";
+ "badquote";
+
/*
* File name selection pattern
*/
*/
#define BAD_LVAL_FIXIDX 24
tSCC zBad_LvalName[] =
- "Bad_Lval";
+ "bad_lval";
+
/*
* File name selection pattern
*/
*/
#define BROKEN_ASSERT_STDIO_FIXIDX 25
tSCC zBroken_Assert_StdioName[] =
- "Broken_Assert_Stdio";
+ "broken_assert_stdio";
+
/*
* File name selection pattern
*/
*/
#define BROKEN_ASSERT_STDLIB_FIXIDX 26
tSCC zBroken_Assert_StdlibName[] =
- "Broken_Assert_Stdlib";
+ "broken_assert_stdlib";
+
/*
* File name selection pattern
*/
*/
#define DEC_INTERN_ASM_FIXIDX 27
tSCC zDec_Intern_AsmName[] =
- "Dec_Intern_Asm";
+ "dec_intern_asm";
+
/*
* File name selection pattern
*/
*/
#define NO_DOUBLE_SLASH_FIXIDX 28
tSCC zNo_Double_SlashName[] =
- "No_Double_Slash";
+ "no_double_slash";
+
/*
* File name selection pattern
*/
*/
#define ECD_CURSOR_FIXIDX 29
tSCC zEcd_CursorName[] =
- "Ecd_Cursor";
+ "ecd_cursor";
+
/*
* File name selection pattern
*/
*/
#define SCO5_STAT_WRAPPERS_FIXIDX 30
tSCC zSco5_Stat_WrappersName[] =
- "Sco5_Stat_Wrappers";
+ "sco5_stat_wrappers";
+
/*
* File name selection pattern
*/
*/
#define END_ELSE_LABEL_FIXIDX 31
tSCC zEnd_Else_LabelName[] =
- "End_Else_Label";
+ "end_else_label";
+
/*
* File name selection pattern
*/
*/
#define HP_INLINE_FIXIDX 32
tSCC zHp_InlineName[] =
- "Hp_Inline";
+ "hp_inline";
+
/*
* File name selection pattern
*/
*/
#define HP_SYSFILE_FIXIDX 33
tSCC zHp_SysfileName[] =
- "Hp_Sysfile";
+ "hp_sysfile";
+
/*
* File name selection pattern
*/
*/
#define CXX_UNREADY_FIXIDX 34
tSCC zCxx_UnreadyName[] =
- "Cxx_Unready";
+ "cxx_unready";
+
/*
* File name selection pattern
*/
*/
#define apzCxx_UnreadyMachs (const char**)NULL
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zCxx_UnreadySelect0[] =
+ "[^#]+malloc.*;";
+
/*
* content bypass pattern - skip fix if pattern found
*/
tSCC zCxx_UnreadyBypass0[] =
"\"C\"|__BEGIN_DECLS";
-#define CXX_UNREADY_TEST_CT 1
+#define CXX_UNREADY_TEST_CT 2
tTestDesc aCxx_UnreadyTests[] = {
- { TT_NEGREP, zCxx_UnreadyBypass0, (regex_t*)NULL }, };
+ { TT_NEGREP, zCxx_UnreadyBypass0, (regex_t*)NULL },
+ { TT_EGREP, zCxx_UnreadySelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Cxx_Unready
*/
#define HPUX_MAXINT_FIXIDX 35
tSCC zHpux_MaxintName[] =
- "Hpux_Maxint";
+ "hpux_maxint";
+
/*
* File name selection pattern
*/
*/
#define HPUX_SYSTIME_FIXIDX 36
tSCC zHpux_SystimeName[] =
- "Hpux_Systime";
+ "hpux_systime";
+
/*
* File name selection pattern
*/
*/
#define HPUX8_BOGUS_INLINES_FIXIDX 37
tSCC zHpux8_Bogus_InlinesName[] =
- "Hpux8_Bogus_Inlines";
+ "hpux8_bogus_inlines";
+
/*
* File name selection pattern
*/
*/
#define HPUX11_UINT32_C_FIXIDX 38
tSCC zHpux11_Uint32_CName[] =
- "Hpux11_Uint32_C";
+ "hpux11_uint32_c";
+
/*
* File name selection pattern
*/
*/
#define ISC_OMITS_WITH_STDC_FIXIDX 39
tSCC zIsc_Omits_With_StdcName[] =
- "Isc_Omits_With_Stdc";
+ "isc_omits_with_stdc";
+
/*
* File name selection pattern
*/
*/
#define IO_USE_QUOTES_FIXIDX 40
tSCC zIo_Use_QuotesName[] =
- "Io_Use_Quotes";
+ "io_use_quotes";
+
/*
* File name selection pattern
*/
*/
#define IO_DEF_QUOTES_FIXIDX 41
tSCC zIo_Def_QuotesName[] =
- "Io_Def_Quotes";
+ "io_def_quotes";
+
/*
* File name selection pattern
*/
*/
#define CTRL_USE_QUOTES_FIXIDX 42
tSCC zCtrl_Use_QuotesName[] =
- "Ctrl_Use_Quotes";
+ "ctrl_use_quotes";
+
/*
* File name selection pattern
*/
*/
#define CTRL_DEF_QUOTES_FIXIDX 43
tSCC zCtrl_Def_QuotesName[] =
- "Ctrl_Def_Quotes";
+ "ctrl_def_quotes";
+
/*
* File name selection pattern
*/
*/
#define IP_MISSING_SEMI_FIXIDX 44
tSCC zIp_Missing_SemiName[] =
- "Ip_Missing_Semi";
+ "ip_missing_semi";
+
/*
* File name selection pattern
*/
*/
#define IRIX_MULTILINE_CMNT_FIXIDX 45
tSCC zIrix_Multiline_CmntName[] =
- "Irix_Multiline_Cmnt";
+ "irix_multiline_cmnt";
+
/*
* File name selection pattern
*/
*/
#define IRIX_SOCKADDR_FIXIDX 46
tSCC zIrix_SockaddrName[] =
- "Irix_Sockaddr";
+ "irix_sockaddr";
+
/*
* File name selection pattern
*/
tSCC zIrix_SockaddrSelect0[] =
"authdes_create.*struct sockaddr";
-#define IRIX_SOCKADDR_TEST_CT 1
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zIrix_SockaddrBypass0[] =
+ "<sys/socket.h>";
+
+#define IRIX_SOCKADDR_TEST_CT 2
tTestDesc aIrix_SockaddrTests[] = {
+ { TT_NEGREP, zIrix_SockaddrBypass0, (regex_t*)NULL },
{ TT_EGREP, zIrix_SockaddrSelect0, (regex_t*)NULL }, };
/*
*/
#define IRIX_STRUCT__FILE_FIXIDX 47
tSCC zIrix_Struct__FileName[] =
- "Irix_Struct__File";
+ "irix_struct__file";
+
/*
* File name selection pattern
*/
*/
#define IRIX_ASM_APOSTROPHE_FIXIDX 48
tSCC zIrix_Asm_ApostropheName[] =
- "Irix_Asm_Apostrophe";
+ "irix_asm_apostrophe";
+
/*
* File name selection pattern
*/
*/
#define ISC_FMOD_FIXIDX 49
tSCC zIsc_FmodName[] =
- "Isc_Fmod";
+ "isc_fmod";
+
/*
* File name selection pattern
*/
*/
#define MOTOROLA_NESTED_FIXIDX 50
tSCC zMotorola_NestedName[] =
- "Motorola_Nested";
+ "motorola_nested";
+
/*
* File name selection pattern
*/
*/
#define ISC_SYS_LIMITS_FIXIDX 51
tSCC zIsc_Sys_LimitsName[] =
- "Isc_Sys_Limits";
+ "isc_sys_limits";
+
/*
* File name selection pattern
*/
*/
#define KANDR_CONCAT_FIXIDX 52
tSCC zKandr_ConcatName[] =
- "Kandr_Concat";
+ "kandr_concat";
+
/*
* File name selection pattern
*/
*/
#define LIMITS_IFNDEFS_FIXIDX 53
tSCC zLimits_IfndefsName[] =
- "Limits_Ifndefs";
+ "limits_ifndefs";
+
/*
* File name selection pattern
*/
*/
#define LYNX_VOID_INT_FIXIDX 54
tSCC zLynx_Void_IntName[] =
- "Lynx_Void_Int";
+ "lynx_void_int";
+
/*
* File name selection pattern
*/
*/
#define LYNXOS_FCNTL_PROTO_FIXIDX 55
tSCC zLynxos_Fcntl_ProtoName[] =
- "Lynxos_Fcntl_Proto";
+ "lynxos_fcntl_proto";
+
/*
* File name selection pattern
*/
*/
#define M88K_BAD_HYPOT_OPT_FIXIDX 56
tSCC zM88k_Bad_Hypot_OptName[] =
- "M88k_Bad_Hypot_Opt";
+ "m88k_bad_hypot_opt";
+
/*
* File name selection pattern
*/
*/
#define M88K_BAD_S_IF_FIXIDX 57
tSCC zM88k_Bad_S_IfName[] =
- "M88k_Bad_S_If";
+ "m88k_bad_s_if";
+
/*
* File name selection pattern
*/
*/
#define M88K_MULTI_INCL_FIXIDX 58
tSCC zM88k_Multi_InclName[] =
- "M88k_Multi_Incl";
+ "m88k_multi_incl";
+
/*
* File name selection pattern
*/
echo \"#endif /* ! __GCC_GOT_${cpp_wrapper}_ */\"",
(char*)NULL };
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Machine_Ansi_H_Va_List fix
+ */
+#define MACHINE_ANSI_H_VA_LIST_FIXIDX 59
+tSCC zMachine_Ansi_H_Va_ListName[] =
+ "machine_ansi_h_va_list";
+
+/*
+ * File name selection pattern
+ */
+tSCC zMachine_Ansi_H_Va_ListList[] =
+ "|machine/ansi.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzMachine_Ansi_H_Va_ListMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zMachine_Ansi_H_Va_ListSelect0[] =
+ "_BSD_VA_LIST_";
+
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zMachine_Ansi_H_Va_ListBypass0[] =
+ "__builtin_va_list";
+
+#define MACHINE_ANSI_H_VA_LIST_TEST_CT 2
+tTestDesc aMachine_Ansi_H_Va_ListTests[] = {
+ { TT_NEGREP, zMachine_Ansi_H_Va_ListBypass0, (regex_t*)NULL },
+ { TT_EGREP, zMachine_Ansi_H_Va_ListSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Machine_Ansi_H_Va_List
+ */
+const char* apzMachine_Ansi_H_Va_ListPatch[] = { "sed",
+ "-e", "s/\\(_BSD_VA_LIST_[ \t][ \t]*\\).*$/\\1__builtin_va_list/",
+ (char*)NULL };
+
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Machine_Name fix
*/
-#define MACHINE_NAME_FIXIDX 59
+#define MACHINE_NAME_FIXIDX 60
tSCC zMachine_NameName[] =
- "Machine_Name";
+ "machine_name";
+
/*
* File name selection pattern
*/
*
* Description of Math_Exception fix
*/
-#define MATH_EXCEPTION_FIXIDX 60
+#define MATH_EXCEPTION_FIXIDX 61
tSCC zMath_ExceptionName[] =
- "Math_Exception";
+ "math_exception";
+
/*
* File name selection pattern
*/
*
* Description of Math_Huge_Val_From_Dbl_Max fix
*/
-#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 61
+#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 62
tSCC zMath_Huge_Val_From_Dbl_MaxName[] =
- "Math_Huge_Val_From_Dbl_Max";
+ "math_huge_val_from_dbl_max";
+
/*
* File name selection pattern
*/
*
* Description of Math_Huge_Val_Ifndef fix
*/
-#define MATH_HUGE_VAL_IFNDEF_FIXIDX 62
+#define MATH_HUGE_VAL_IFNDEF_FIXIDX 63
tSCC zMath_Huge_Val_IfndefName[] =
- "Math_Huge_Val_Ifndef";
+ "math_huge_val_ifndef";
+
/*
* File name selection pattern
*/
*
* Description of Nested_Comment fix
*/
-#define NESTED_COMMENT_FIXIDX 63
+#define NESTED_COMMENT_FIXIDX 64
tSCC zNested_CommentName[] =
- "Nested_Comment";
+ "nested_comment";
+
/*
* File name selection pattern
*/
*
* Description of News_Os_Recursion fix
*/
-#define NEWS_OS_RECURSION_FIXIDX 64
+#define NEWS_OS_RECURSION_FIXIDX 65
tSCC zNews_Os_RecursionName[] =
- "News_Os_Recursion";
+ "news_os_recursion";
+
/*
* File name selection pattern
*/
*
* Description of Next_Math_Prefix fix
*/
-#define NEXT_MATH_PREFIX_FIXIDX 65
+#define NEXT_MATH_PREFIX_FIXIDX 66
tSCC zNext_Math_PrefixName[] =
- "Next_Math_Prefix";
+ "next_math_prefix";
+
/*
* File name selection pattern
*/
*
* Description of Next_Template fix
*/
-#define NEXT_TEMPLATE_FIXIDX 66
+#define NEXT_TEMPLATE_FIXIDX 67
tSCC zNext_TemplateName[] =
- "Next_Template";
+ "next_template";
+
/*
* File name selection pattern
*/
*
* Description of Next_Volitile fix
*/
-#define NEXT_VOLITILE_FIXIDX 67
+#define NEXT_VOLITILE_FIXIDX 68
tSCC zNext_VolitileName[] =
- "Next_Volitile";
+ "next_volitile";
+
/*
* File name selection pattern
*/
*
* Description of Next_Wait_Union fix
*/
-#define NEXT_WAIT_UNION_FIXIDX 68
+#define NEXT_WAIT_UNION_FIXIDX 69
tSCC zNext_Wait_UnionName[] =
- "Next_Wait_Union";
+ "next_wait_union";
+
/*
* File name selection pattern
*/
*
* Description of Nodeent_Syntax fix
*/
-#define NODEENT_SYNTAX_FIXIDX 69
+#define NODEENT_SYNTAX_FIXIDX 70
tSCC zNodeent_SyntaxName[] =
- "Nodeent_Syntax";
+ "nodeent_syntax";
+
/*
* File name selection pattern
*/
*
* Description of Osf_Namespace_A fix
*/
-#define OSF_NAMESPACE_A_FIXIDX 70
+#define OSF_NAMESPACE_A_FIXIDX 71
tSCC zOsf_Namespace_AName[] =
- "Osf_Namespace_A";
+ "osf_namespace_a";
+
/*
* File name selection pattern
*/
*
* Description of Osf_Namespace_B fix
*/
-#define OSF_NAMESPACE_B_FIXIDX 71
+#define OSF_NAMESPACE_B_FIXIDX 72
tSCC zOsf_Namespace_BName[] =
- "Osf_Namespace_B";
+ "osf_namespace_b";
+
/*
* File name selection pattern
*/
*
* Description of Pthread_Page_Size fix
*/
-#define PTHREAD_PAGE_SIZE_FIXIDX 72
+#define PTHREAD_PAGE_SIZE_FIXIDX 73
tSCC zPthread_Page_SizeName[] =
- "Pthread_Page_Size";
+ "pthread_page_size";
+
/*
* File name selection pattern
*/
*
* Description of Read_Ret_Type fix
*/
-#define READ_RET_TYPE_FIXIDX 73
+#define READ_RET_TYPE_FIXIDX 74
tSCC zRead_Ret_TypeName[] =
- "Read_Ret_Type";
+ "read_ret_type";
+
/*
* File name selection pattern
*/
*
* Description of Rs6000_Double fix
*/
-#define RS6000_DOUBLE_FIXIDX 74
+#define RS6000_DOUBLE_FIXIDX 75
tSCC zRs6000_DoubleName[] =
- "Rs6000_Double";
+ "rs6000_double";
+
/*
* File name selection pattern
*/
*
* Description of Rs6000_Fchmod fix
*/
-#define RS6000_FCHMOD_FIXIDX 75
+#define RS6000_FCHMOD_FIXIDX 76
tSCC zRs6000_FchmodName[] =
- "Rs6000_Fchmod";
+ "rs6000_fchmod";
+
/*
* File name selection pattern
*/
*
* Description of Rs6000_Param fix
*/
-#define RS6000_PARAM_FIXIDX 76
+#define RS6000_PARAM_FIXIDX 77
tSCC zRs6000_ParamName[] =
- "Rs6000_Param";
+ "rs6000_param";
+
/*
* File name selection pattern
*/
*
* Description of Sony_Include fix
*/
-#define SONY_INCLUDE_FIXIDX 77
+#define SONY_INCLUDE_FIXIDX 78
tSCC zSony_IncludeName[] =
- "Sony_Include";
+ "sony_include";
+
/*
* File name selection pattern
*/
*
* Description of Statsswtch fix
*/
-#define STATSSWTCH_FIXIDX 78
+#define STATSSWTCH_FIXIDX 79
tSCC zStatsswtchName[] =
- "Statsswtch";
+ "statsswtch";
+
/*
* File name selection pattern
*/
"-e", "s/boottime$/boottime;/",
(char*)NULL };
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Stdio_Stdarg_H fix
+ */
+#define STDIO_STDARG_H_FIXIDX 80
+tSCC zStdio_Stdarg_HName[] =
+ "stdio_stdarg_h";
+
+/*
+ * File name selection pattern
+ */
+tSCC zStdio_Stdarg_HList[] =
+ "|stdio.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzStdio_Stdarg_HMachs (const char**)NULL
+
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zStdio_Stdarg_HBypass0[] =
+ "include.*(stdarg.h|machine/ansi.h)";
+
+#define STDIO_STDARG_H_TEST_CT 1
+tTestDesc aStdio_Stdarg_HTests[] = {
+ { TT_NEGREP, zStdio_Stdarg_HBypass0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Stdio_Stdarg_H
+ */
+const char* apzStdio_Stdarg_HPatch[] = { "sed",
+ "-e", "1i\\\n\
+#define __need___va_list\\\n\
+#include <stdarg.h>\n",
+ (char*)NULL };
+
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Stdio_Va_List fix
*/
-#define STDIO_VA_LIST_FIXIDX 79
+#define STDIO_VA_LIST_FIXIDX 81
tSCC zStdio_Va_ListName[] =
- "Stdio_Va_List";
+ "stdio_va_list";
+
/*
* File name selection pattern
*/
* content bypass pattern - skip fix if pattern found
*/
tSCC zStdio_Va_ListBypass0[] =
- "__gnuc_va_list";
+ "__gnuc_va_list|_BSD_VA_LIST_";
#define STDIO_VA_LIST_TEST_CT 1
tTestDesc aStdio_Va_ListTests[] = {
/*
* Fix Command Arguments for Stdio_Va_List
*/
-const char* apzStdio_Va_ListPatch[] = { "sh", "-c",
- "if ( egrep \"__need___va_list\" $file ) > /dev/null 2>&1 ; then\n\
- :\n\
- else\n\
- echo \"#define __need___va_list\"\n\
- echo \"#include <stdarg.h>\"\n\
- fi\n\
-\n\
- sed -e 's@ va_list @ __gnuc_va_list @' \\\n\
- -e 's@ va_list)@ __gnuc_va_list)@' \\\n\
- -e 's@ _BSD_VA_LIST_))@ __gnuc_va_list))@' \\\n\
- -e 's@ _VA_LIST_));@ __gnuc_va_list));@' \\\n\
- -e 's@ va_list@ __not_va_list__@' \\\n\
- -e 's@\\*va_list@*__not_va_list__@' \\\n\
- -e 's@ __va_list)@ __gnuc_va_list)@' \\\n\
- -e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \\\n\
- -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \\\n\
- -e 's@VA_LIST@DUMMY_VA_LIST@' \\\n\
- -e 's@_Va_LIST@_VA_LIST@'",
+const char* apzStdio_Va_ListPatch[] = { "sed",
+ "-e", "s@ va_list @ __gnuc_va_list @\n\
+s@ va_list)@ __gnuc_va_list)@\n\
+s@ _VA_LIST_));@ __gnuc_va_list));@\n\
+s@ va_list@ __not_va_list__@\n\
+s@\\*va_list@*__not_va_list__@\n\
+s@ __va_list)@ __gnuc_va_list)@\n\
+s@GNUC_VA_LIST@GNUC_Va_LIST@\n\
+s@_NEED___VA_LIST@_NEED___Va_LIST@\n\
+s@VA_LIST@DUMMY_VA_LIST@\n\
+s@_Va_LIST@_VA_LIST@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Sun_Bogus_Ifdef fix
*/
-#define SUN_BOGUS_IFDEF_FIXIDX 80
+#define SUN_BOGUS_IFDEF_FIXIDX 82
tSCC zSun_Bogus_IfdefName[] =
- "Sun_Bogus_Ifdef";
+ "sun_bogus_ifdef";
+
/*
* File name selection pattern
*/
*
* Description of Sun_Bogus_Ifdef_Sun4c fix
*/
-#define SUN_BOGUS_IFDEF_SUN4C_FIXIDX 81
+#define SUN_BOGUS_IFDEF_SUN4C_FIXIDX 83
tSCC zSun_Bogus_Ifdef_Sun4cName[] =
- "Sun_Bogus_Ifdef_Sun4c";
+ "sun_bogus_ifdef_sun4c";
+
/*
* File name selection pattern
*/
*
* Description of Sun_Catmacro fix
*/
-#define SUN_CATMACRO_FIXIDX 82
+#define SUN_CATMACRO_FIXIDX 84
tSCC zSun_CatmacroName[] =
- "Sun_Catmacro";
+ "sun_catmacro";
+
/*
* File name selection pattern
*/
*
* Description of Sun_Malloc fix
*/
-#define SUN_MALLOC_FIXIDX 83
+#define SUN_MALLOC_FIXIDX 85
tSCC zSun_MallocName[] =
- "Sun_Malloc";
+ "sun_malloc";
+
/*
* File name selection pattern
*/
*
* Description of Sun_Rusers_Semi fix
*/
-#define SUN_RUSERS_SEMI_FIXIDX 84
+#define SUN_RUSERS_SEMI_FIXIDX 86
tSCC zSun_Rusers_SemiName[] =
- "Sun_Rusers_Semi";
+ "sun_rusers_semi";
+
/*
* File name selection pattern
*/
*
* Description of Sun_Signal fix
*/
-#define SUN_SIGNAL_FIXIDX 85
+#define SUN_SIGNAL_FIXIDX 87
tSCC zSun_SignalName[] =
- "Sun_Signal";
+ "sun_signal";
+
/*
* File name selection pattern
*/
*
* Description of Sun_Auth_Proto fix
*/
-#define SUN_AUTH_PROTO_FIXIDX 86
+#define SUN_AUTH_PROTO_FIXIDX 88
tSCC zSun_Auth_ProtoName[] =
- "Sun_Auth_Proto";
+ "sun_auth_proto";
+
/*
* File name selection pattern
*/
*
* Description of Sunos_Matherr_Decl fix
*/
-#define SUNOS_MATHERR_DECL_FIXIDX 87
+#define SUNOS_MATHERR_DECL_FIXIDX 89
tSCC zSunos_Matherr_DeclName[] =
- "Sunos_Matherr_Decl";
+ "sunos_matherr_decl";
+
/*
* File name selection pattern
*/
*
* Description of Sunos_Strlen fix
*/
-#define SUNOS_STRLEN_FIXIDX 88
+#define SUNOS_STRLEN_FIXIDX 90
tSCC zSunos_StrlenName[] =
- "Sunos_Strlen";
+ "sunos_strlen";
+
/*
* File name selection pattern
*/
*
* Description of Systypes fix
*/
-#define SYSTYPES_FIXIDX 89
+#define SYSTYPES_FIXIDX 91
tSCC zSystypesName[] =
- "Systypes";
+ "systypes";
+
/*
* File name selection pattern
*/
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Systypes_For_Aix fix
+ * Description of Systypes_Stdlib_Size_T fix
*/
-#define SYSTYPES_FOR_AIX_FIXIDX 90
-tSCC zSystypes_For_AixName[] =
- "Systypes_For_Aix";
+#define SYSTYPES_STDLIB_SIZE_T_FIXIDX 92
+tSCC zSystypes_Stdlib_Size_TName[] =
+ "systypes_stdlib_size_t";
+
/*
* File name selection pattern
*/
-tSCC zSystypes_For_AixList[] =
- "|sys/types.h|";
+tSCC zSystypes_Stdlib_Size_TList[] =
+ "|sys/types.h|stdlib.h|";
/*
* Machine/OS name selection pattern
*/
-#define apzSystypes_For_AixMachs (const char**)NULL
+#define apzSystypes_Stdlib_Size_TMachs (const char**)NULL
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zSystypes_For_AixSelect0[] =
+tSCC zSystypes_Stdlib_Size_TSelect0[] =
"typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t";
/*
* content bypass pattern - skip fix if pattern found
*/
-tSCC zSystypes_For_AixBypass0[] =
- "_GCC_SIZE_T";
+tSCC zSystypes_Stdlib_Size_TBypass0[] =
+ "_(GCC|BSD)_SIZE_T";
-#define SYSTYPES_FOR_AIX_TEST_CT 2
-tTestDesc aSystypes_For_AixTests[] = {
- { TT_NEGREP, zSystypes_For_AixBypass0, (regex_t*)NULL },
- { TT_EGREP, zSystypes_For_AixSelect0, (regex_t*)NULL }, };
+#define SYSTYPES_STDLIB_SIZE_T_TEST_CT 2
+tTestDesc aSystypes_Stdlib_Size_TTests[] = {
+ { TT_NEGREP, zSystypes_Stdlib_Size_TBypass0, (regex_t*)NULL },
+ { TT_EGREP, zSystypes_Stdlib_Size_TSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Systypes_For_Aix
+ * Fix Command Arguments for Systypes_Stdlib_Size_T
*/
-const char* apzSystypes_For_AixPatch[] = { "sed",
+const char* apzSystypes_Stdlib_Size_TPatch[] = { "sed",
"-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",
*
* Description of Sysv68_String fix
*/
-#define SYSV68_STRING_FIXIDX 91
+#define SYSV68_STRING_FIXIDX 93
tSCC zSysv68_StringName[] =
- "Sysv68_String";
+ "sysv68_string";
+
/*
* File name selection pattern
*/
*
* Description of Sysz_Stdlib_For_Sun fix
*/
-#define SYSZ_STDLIB_FOR_SUN_FIXIDX 92
+#define SYSZ_STDLIB_FOR_SUN_FIXIDX 94
tSCC zSysz_Stdlib_For_SunName[] =
- "Sysz_Stdlib_For_Sun";
+ "sysz_stdlib_for_sun";
+
/*
* File name selection pattern
*/
"-e", "s/char[ \t]*\\*[ \t]*realloc/void \\*\trealloc/g",
"-e", "s/char[ \t]*\\*[ \t]*bsearch/void \\*\tbsearch/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\
-#endif\n",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Sysz_Stdtypes_For_Sun fix
*/
-#define SYSZ_STDTYPES_FOR_SUN_FIXIDX 93
+#define SYSZ_STDTYPES_FOR_SUN_FIXIDX 95
tSCC zSysz_Stdtypes_For_SunName[] =
- "Sysz_Stdtypes_For_Sun";
+ "sysz_stdtypes_for_sun";
+
/*
* File name selection pattern
*/
*
* Description of Tinfo_Cplusplus fix
*/
-#define TINFO_CPLUSPLUS_FIXIDX 94
+#define TINFO_CPLUSPLUS_FIXIDX 96
tSCC zTinfo_CplusplusName[] =
- "Tinfo_Cplusplus";
+ "tinfo_cplusplus";
+
/*
* File name selection pattern
*/
*
* Description of Ultrix_Fix_Fixproto fix
*/
-#define ULTRIX_FIX_FIXPROTO_FIXIDX 95
+#define ULTRIX_FIX_FIXPROTO_FIXIDX 97
tSCC zUltrix_Fix_FixprotoName[] =
- "Ultrix_Fix_Fixproto";
+ "ultrix_fix_fixproto";
+
/*
* File name selection pattern
*/
*
* Description of Ultrix_Atof_Param fix
*/
-#define ULTRIX_ATOF_PARAM_FIXIDX 96
+#define ULTRIX_ATOF_PARAM_FIXIDX 98
tSCC zUltrix_Atof_ParamName[] =
- "Ultrix_Atof_Param";
+ "ultrix_atof_param";
+
/*
* File name selection pattern
*/
*
* Description of Ultrix_Const fix
*/
-#define ULTRIX_CONST_FIXIDX 97
+#define ULTRIX_CONST_FIXIDX 99
tSCC zUltrix_ConstName[] =
- "Ultrix_Const";
+ "ultrix_const";
+
/*
* File name selection pattern
*/
*
* Description of Ultrix_Ifdef fix
*/
-#define ULTRIX_IFDEF_FIXIDX 98
+#define ULTRIX_IFDEF_FIXIDX 100
tSCC zUltrix_IfdefName[] =
- "Ultrix_Ifdef";
+ "ultrix_ifdef";
+
/*
* File name selection pattern
*/
* content selection pattern - do fix if pattern found
*/
tSCC zUltrix_IfdefSelect0[] =
- "#ifdef KERNEL";
+ "#ifdef KERNEL[ \t]*[^ \t]";
#define ULTRIX_IFDEF_TEST_CT 1
tTestDesc aUltrix_IfdefTests[] = {
*
* Description of Ultrix_Nested_Cmnt fix
*/
-#define ULTRIX_NESTED_CMNT_FIXIDX 99
+#define ULTRIX_NESTED_CMNT_FIXIDX 101
tSCC zUltrix_Nested_CmntName[] =
- "Ultrix_Nested_Cmnt";
+ "ultrix_nested_cmnt";
+
/*
* File name selection pattern
*/
*
* Description of Ultrix_Static fix
*/
-#define ULTRIX_STATIC_FIXIDX 100
+#define ULTRIX_STATIC_FIXIDX 102
tSCC zUltrix_StaticName[] =
- "Ultrix_Static";
+ "ultrix_static";
+
/*
* File name selection pattern
*/
*
* Description of Undefine_Null fix
*/
-#define UNDEFINE_NULL_FIXIDX 101
+#define UNDEFINE_NULL_FIXIDX 103
tSCC zUndefine_NullName[] =
- "Undefine_Null";
+ "undefine_null";
+
/*
* File name selection pattern
*/
*
* Description of Unixware7_Byteorder_Fix fix
*/
-#define UNIXWARE7_BYTEORDER_FIX_FIXIDX 102
+#define UNIXWARE7_BYTEORDER_FIX_FIXIDX 104
tSCC zUnixware7_Byteorder_FixName[] =
- "Unixware7_Byteorder_Fix";
+ "unixware7_byteorder_fix";
+
/*
* File name selection pattern
*/
*
* Description of Va_I960_Macro fix
*/
-#define VA_I960_MACRO_FIXIDX 103
+#define VA_I960_MACRO_FIXIDX 105
tSCC zVa_I960_MacroName[] =
- "Va_I960_Macro";
+ "va_i960_macro";
+
/*
* File name selection pattern
*/
*
* Description of Void_Null fix
*/
-#define VOID_NULL_FIXIDX 104
+#define VOID_NULL_FIXIDX 106
tSCC zVoid_NullName[] =
- "Void_Null";
+ "void_null";
+
/*
* File name selection pattern
*/
*
* Description of Vxworks_Gcc_Problem fix
*/
-#define VXWORKS_GCC_PROBLEM_FIXIDX 105
+#define VXWORKS_GCC_PROBLEM_FIXIDX 107
tSCC zVxworks_Gcc_ProblemName[] =
- "Vxworks_Gcc_Problem";
+ "vxworks_gcc_problem";
+
/*
* File name selection pattern
*/
*
* Description of Vxworks_Needs_Vxtypes fix
*/
-#define VXWORKS_NEEDS_VXTYPES_FIXIDX 106
+#define VXWORKS_NEEDS_VXTYPES_FIXIDX 108
tSCC zVxworks_Needs_VxtypesName[] =
- "Vxworks_Needs_Vxtypes";
+ "vxworks_needs_vxtypes";
+
/*
* File name selection pattern
*/
*
* Description of Vxworks_Needs_Vxworks fix
*/
-#define VXWORKS_NEEDS_VXWORKS_FIXIDX 107
+#define VXWORKS_NEEDS_VXWORKS_FIXIDX 109
tSCC zVxworks_Needs_VxworksName[] =
- "Vxworks_Needs_Vxworks";
+ "vxworks_needs_vxworks";
+
/*
* File name selection pattern
*/
*
* Description of Vxworks_Time fix
*/
-#define VXWORKS_TIME_FIXIDX 108
+#define VXWORKS_TIME_FIXIDX 110
tSCC zVxworks_TimeName[] =
- "Vxworks_Time";
+ "vxworks_time";
+
/*
* File name selection pattern
*/
*
* Description of X11_Class fix
*/
-#define X11_CLASS_FIXIDX 109
+#define X11_CLASS_FIXIDX 111
tSCC zX11_ClassName[] =
- "X11_Class";
+ "x11_class";
+
/*
* File name selection pattern
*/
*
* Description of X11_Class_Usage fix
*/
-#define X11_CLASS_USAGE_FIXIDX 110
+#define X11_CLASS_USAGE_FIXIDX 112
tSCC zX11_Class_UsageName[] =
- "X11_Class_Usage";
+ "x11_class_usage";
+
/*
* File name selection pattern
*/
*
* Description of X11_New fix
*/
-#define X11_NEW_FIXIDX 111
+#define X11_NEW_FIXIDX 113
tSCC zX11_NewName[] =
- "X11_New";
+ "x11_new";
+
/*
* File name selection pattern
*/
*
* Description of X11_Sprintf fix
*/
-#define X11_SPRINTF_FIXIDX 112
+#define X11_SPRINTF_FIXIDX 114
tSCC zX11_SprintfName[] =
- "X11_Sprintf";
+ "x11_sprintf";
+
/*
* File name selection pattern
*/
#endif /* !defined __STDC__ */,",
(char*)NULL };
+
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* List of all fixes
*/
-#define REGEX_COUNT 108
+#define REGEX_COUNT 98
#define MACH_LIST_SIZE_LIMIT 279
-#define FIX_COUNT 113
+#define FIX_COUNT 115
tFixDesc fixDescList[ FIX_COUNT ] = {
{ zAaa_Ki_IfaceName, zAaa_Ki_IfaceList,
M88K_MULTI_INCL_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT,
aM88k_Multi_InclTests, apzM88k_Multi_InclPatch },
+ { zMachine_Ansi_H_Va_ListName, zMachine_Ansi_H_Va_ListList,
+ apzMachine_Ansi_H_Va_ListMachs, (regex_t*)NULL,
+ MACHINE_ANSI_H_VA_LIST_TEST_CT, FD_MACH_ONLY,
+ aMachine_Ansi_H_Va_ListTests, apzMachine_Ansi_H_Va_ListPatch },
+
{ zMachine_NameName, zMachine_NameList,
apzMachine_NameMachs, (regex_t*)NULL,
MACHINE_NAME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
STATSSWTCH_TEST_CT, FD_MACH_ONLY,
aStatsswtchTests, apzStatsswtchPatch },
+ { zStdio_Stdarg_HName, zStdio_Stdarg_HList,
+ apzStdio_Stdarg_HMachs, (regex_t*)NULL,
+ STDIO_STDARG_H_TEST_CT, FD_MACH_ONLY,
+ aStdio_Stdarg_HTests, apzStdio_Stdarg_HPatch },
+
{ zStdio_Va_ListName, zStdio_Va_ListList,
apzStdio_Va_ListMachs, (regex_t*)NULL,
- STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT,
+ STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY,
aStdio_Va_ListTests, apzStdio_Va_ListPatch },
{ zSun_Bogus_IfdefName, zSun_Bogus_IfdefList,
SYSTYPES_TEST_CT, FD_MACH_ONLY,
aSystypesTests, apzSystypesPatch },
- { zSystypes_For_AixName, zSystypes_For_AixList,
- apzSystypes_For_AixMachs, (regex_t*)NULL,
- SYSTYPES_FOR_AIX_TEST_CT, FD_MACH_ONLY,
- aSystypes_For_AixTests, apzSystypes_For_AixPatch },
+ { zSystypes_Stdlib_Size_TName, zSystypes_Stdlib_Size_TList,
+ apzSystypes_Stdlib_Size_TMachs, (regex_t*)NULL,
+ SYSTYPES_STDLIB_SIZE_T_TEST_CT, FD_MACH_ONLY,
+ aSystypes_Stdlib_Size_TTests, apzSystypes_Stdlib_Size_TPatch },
{ zSysv68_StringName, zSysv68_StringList,
apzSysv68_StringMachs, (regex_t*)NULL,
git://gcc.gnu.org / gcc.git / commitdiff