From d475e8040a76eb7776eb5ed8f3f3edc0f417f6c7 Mon Sep 17 00:00:00 2001 From: goodale Date: Wed, 24 Nov 1999 20:50:59 +0000 Subject: Removed tabs from files. Added @version lines to various header files. Tom git-svn-id: http://svn.cactuscode.org/flesh/trunk@1170 17b73243-c579-4c4c-a9d2-2d5706c11dac --- src/include/CactusCommFunctions.h | 5 +- src/include/CactusIOFunctions.h | 5 +- src/include/CactusMainDefaults.h | 6 +- src/include/CactusMainFunctions.h | 3 +- src/include/CactusRegister.h | 5 +- src/include/CactusTimers.h | 6 +- src/include/OverloadMacros.h | 2 +- src/include/ParameterBindings.h | 7 ++- src/include/RegisterKeyedFunction.h | 14 ++--- src/include/SKBinTree.h | 9 +-- src/include/cctk.h | 8 +-- src/include/cctk_GHExtensions.h | 10 ++-- src/include/cctk_Groups.h | 10 ++-- src/include/cctk_Misc.h | 10 ++-- src/include/cctk_ParameterFunctions.h | 2 +- src/include/cctk_Reduction.h | 22 ++++---- src/include/cctk_WarnLevel.h | 9 +-- src/include/cctki_schedule.h | 16 +++--- src/include/getopt.h | 39 ++++++++----- src/include/gnu_regex.h | 102 +++++++++++++++++----------------- src/include/rfrConstants.h | 22 +++++--- 21 files changed, 159 insertions(+), 153 deletions(-) (limited to 'src/include') diff --git a/src/include/CactusCommFunctions.h b/src/include/CactusCommFunctions.h index 3f4962ed..9d65a05b 100644 --- a/src/include/CactusCommFunctions.h +++ b/src/include/CactusCommFunctions.h @@ -5,9 +5,8 @@ @desc Overloadable communication functions @enddesc + @version $Header$ @@*/ - -/* $Id$ */ #ifndef _CACTUSCOMMFUNCTIONS_H_ #define _CACTUSCOMMFUNCTIONS_H_ @@ -29,7 +28,7 @@ extern "C" { #undef OVERLOADABLE #ifdef __cplusplus - } +} #endif #endif diff --git a/src/include/CactusIOFunctions.h b/src/include/CactusIOFunctions.h index a86fecd5..e9e131a7 100644 --- a/src/include/CactusIOFunctions.h +++ b/src/include/CactusIOFunctions.h @@ -5,9 +5,8 @@ @desc Overloadable IO functions @enddesc + @version $Header$ @@*/ - -/* $Header$ */ #ifndef _CACTUSIOFUNCTIONS_H_ #define _CACTUSIOFUNCTIONS_H_ @@ -29,7 +28,7 @@ extern "C" { #undef OVERLOADABLE #ifdef __cplusplus - } +} #endif #endif diff --git a/src/include/CactusMainDefaults.h b/src/include/CactusMainDefaults.h index 3cfb48ea..9668f28d 100644 --- a/src/include/CactusMainDefaults.h +++ b/src/include/CactusMainDefaults.h @@ -5,11 +5,9 @@ @desc Prototypes for default functions. @enddesc + @version $Header$ @@*/ - -/* $Id$ */ - #ifndef _CACTUSMAINDEFAULTS_H_ #define _CACTUSMAINDEFAULTS_H_ @@ -22,7 +20,7 @@ int CactusDefaultEvolve(tFleshConfig *); int CactusDefaultShutdown(tFleshConfig *); #ifdef __cplusplus - } +} #endif #endif diff --git a/src/include/CactusMainFunctions.h b/src/include/CactusMainFunctions.h index 1fd4762c..431ff407 100644 --- a/src/include/CactusMainFunctions.h +++ b/src/include/CactusMainFunctions.h @@ -5,6 +5,7 @@ @desc Main registerable functions. @enddesc + @version $Header$ @@*/ #ifndef _CACTUSMAINFUNCTIONS_H_ @@ -25,7 +26,7 @@ extern "C" { #undef OVERLOADABLE #ifdef __cplusplus - } +} #endif #endif diff --git a/src/include/CactusRegister.h b/src/include/CactusRegister.h index c5c0e27d..0bf5d05c 100644 --- a/src/include/CactusRegister.h +++ b/src/include/CactusRegister.h @@ -5,10 +5,9 @@ @desc Functions used to register things in cactus. @enddesc + @version $Header$ @@*/ -/* $Id$ */ - #ifndef _CACTUS_REGISTRY_H_ #define _CACTUS_REGISTRY_H_ @@ -21,7 +20,7 @@ int RegisterMainFunction(int key, int (*func)(tFleshConfig *)); int SetupMainFunctions(void); #ifdef __cplusplus - } +} #endif #endif diff --git a/src/include/CactusTimers.h b/src/include/CactusTimers.h index b817222c..04172fa6 100644 --- a/src/include/CactusTimers.h +++ b/src/include/CactusTimers.h @@ -5,11 +5,9 @@ @desc Timer stuff @enddesc + @version $Header$ @@*/ - -/* $Id$ */ - #ifndef _CACTUSTIMERS_H_ #define _CACTUSTIMERS_H_ @@ -75,7 +73,7 @@ t_TimerInfo *CCTK_TimerCreateInfo(void); void CCTK_TimerDestroyInfo(t_TimerInfo *info); #ifdef __cplusplus - } + } #endif #define INITIALISATION 0 diff --git a/src/include/OverloadMacros.h b/src/include/OverloadMacros.h index 53b96a9a..eb2ba190 100644 --- a/src/include/OverloadMacros.h +++ b/src/include/OverloadMacros.h @@ -43,7 +43,7 @@ int CCTK_Overload##name(RETURN_TYPE (*func)(ARGUMENTS)) \ { \ char *message = malloc( (200+strlen(#name))*sizeof(char) ); \ sprintf(message, \ - "Warning: Attempted to overload function %s twice\n",\ + "Warning: Attempted to overload function %s twice\n",\ #name); \ CCTK_Warn(1,__LINE__,__FILE__,"Cactus",message); \ free(message); \ diff --git a/src/include/ParameterBindings.h b/src/include/ParameterBindings.h index d1b590a8..c1b055df 100644 --- a/src/include/ParameterBindings.h +++ b/src/include/ParameterBindings.h @@ -5,6 +5,7 @@ @desc Defines for parameter stuff @enddesc + @version $Header$ @@*/ #ifndef _PARAMETERBINDINGS_H_ @@ -16,15 +17,15 @@ extern "C" { #endif int ParameterCreate(const char *name, /* The parameter name */ - const char *thorn, /* The thorn */ - const char *type, /* The parameter type */ + const char *thorn, /* The thorn */ + const char *type, /* The parameter type */ const char *scope, /* The scoping block */ int steerable, /* Is it steerable ? */ const char *description, /* The description */ const char *defval, /* The default value */ void *datapointer, /* The actual data */ int n_ranges, /* How many allowed ranges it has */ - ...); + ...); int ParameterAddRange(const char *implementation, const char *name, diff --git a/src/include/RegisterKeyedFunction.h b/src/include/RegisterKeyedFunction.h index 60fdbeac..5be1fdde 100644 --- a/src/include/RegisterKeyedFunction.h +++ b/src/include/RegisterKeyedFunction.h @@ -5,11 +5,9 @@ @desc Header file for keyed function registration. @enddesc + @version $Header$ @@*/ -/* $Id$ */ - - #ifndef _REGISTERKEYEDFUNCTION_H_ #define _REGISTERKEYEDFUNCTION_H_ @@ -21,13 +19,13 @@ extern "C" { #endif int RegisterKeyedFunction(void (*array[])(), - int min, int max, - int key, void (*func)()); + int min, int max, + int key, void (*func)()); void (**(CreateKeyedFunctionArray(int size)))(); #ifdef __cplusplus - } +} #endif /*****************************************************/ @@ -35,8 +33,8 @@ void (**(CreateKeyedFunctionArray(int size)))(); /* Possible return codes. */ enum RegisterKeyedFunctionErrors {REG_KEYED_FUNCTION_SUCCESS, - REG_KEYED_FUNCTION_ALREADY_ASSIGNED, - REG_KEYED_FUNCTION_RANGE_ERROR}; + REG_KEYED_FUNCTION_ALREADY_ASSIGNED, + REG_KEYED_FUNCTION_RANGE_ERROR}; /*****************************************************/ diff --git a/src/include/SKBinTree.h b/src/include/SKBinTree.h index 2de16657..f4775e5a 100644 --- a/src/include/SKBinTree.h +++ b/src/include/SKBinTree.h @@ -5,6 +5,7 @@ @desc Prototypes and data definitions for binary tree routines. @enddesc + @version $Header$ @@*/ #ifndef _SKBINTREE_H_ @@ -26,9 +27,9 @@ extern "C" { #endif t_sktree *SKTreeStoreData(t_sktree *root, - t_sktree *subtree, - const char *key, - void *data); + t_sktree *subtree, + const char *key, + void *data); int SKTreeTraverseInorder(t_sktree *root, int (*process)(void *, void *), void *info); @@ -43,7 +44,7 @@ t_sktree *SKTreeFindNode(t_sktree *root, const char *key); t_sktree *SKTreeFindFirst(t_sktree *root); #ifdef _cplusplus - } +} #endif #endif diff --git a/src/include/cctk.h b/src/include/cctk.h index ea5008e2..77dd3099 100644 --- a/src/include/cctk.h +++ b/src/include/cctk.h @@ -5,7 +5,7 @@ @desc Main include file for the CCTK. All thorns should include this... @enddesc - @version $Id$ + @version $Header$ @@*/ #ifndef _CCTK_H_ @@ -43,7 +43,7 @@ INTEGER cctk_bbox(2*cctk_dim)&&\ CCTK_REAL cctk_delta_time, cctk_time&&\ CCTK_REAL cctk_delta_space(cctk_dim)&&\ - CCTK_REAL cctk_origin_space(cctk_dim)&&\ + CCTK_REAL cctk_origin_space(cctk_dim)&&\ INTEGER cctk_levfac(cctk_dim)&&\ INTEGER cctk_convlevel&&\ INTEGER cctk_nghostzones(cctk_dim)&&\ @@ -137,7 +137,7 @@ (xGH)->cctk_bbox,\ &((xGH)->cctk_delta_time), \ &((xGH)->cctk_time), (xGH)->cctk_delta_space,\ - (xGH)->cctk_origin_space,\ + (xGH)->cctk_origin_space,\ (xGH)->cctk_levfac,\ &((xGH)->cctk_convlevel),\ (xGH)->cctk_nghostzones,\ @@ -147,7 +147,7 @@ int *,\ int *,int *, int *, int *,int *,int *,\ CCTK_REAL *, CCTK_REAL *, CCTK_REAL *,\ - CCTK_REAL *,\ + CCTK_REAL *,\ int *,\ int *,\ int *,\ diff --git a/src/include/cctk_GHExtensions.h b/src/include/cctk_GHExtensions.h index 99569477..1fc0bfb9 100644 --- a/src/include/cctk_GHExtensions.h +++ b/src/include/cctk_GHExtensions.h @@ -3,9 +3,9 @@ @date Fri Jan 15 14:15:20 1999 @author Tom Goodale @desc - + Prototypes for functions dealing with GH extensions. @enddesc - @version $Id$ + @version $Header$ @@*/ #ifndef _GHEXTENSIONS_H_ @@ -18,15 +18,15 @@ extern "C" { int CCTK_RegisterGHExtension(const char *name); int CCTK_RegisterGHExtensionSetupGH(int handle, - void *(*func)(tFleshConfig *, int, cGH *)); + void *(*func)(tFleshConfig *, int, cGH *)); int CCTK_RegisterGHExtensionInitGH(int handle, int (*func)(cGH *)); int CCTK_RegisterGHExtensionrfrTraverseGH(int handle, int (*func)(cGH *, int)); int CCTKi_SetupGHExtensions(tFleshConfig *config, - int convergence_level, - cGH *GH); + int convergence_level, + cGH *GH); int CCTKi_InitGHExtensions(cGH *GH); diff --git a/src/include/cctk_Groups.h b/src/include/cctk_Groups.h index e726ae32..4e058da5 100644 --- a/src/include/cctk_Groups.h +++ b/src/include/cctk_Groups.h @@ -44,11 +44,11 @@ int CCTK_VarTypeNumber(const char *type); int CCTK_GroupScopeNumber(const char *type); int CCTK_GroupData(int group, - int *gtype, - int *vtype, - int *dim, - int *n_variables, - int *n_timelevels); + int *gtype, + int *vtype, + int *dim, + int *n_variables, + int *n_timelevels); char *CCTK_VarName(int varnum); diff --git a/src/include/cctk_Misc.h b/src/include/cctk_Misc.h index d6506dd6..b0b41771 100644 --- a/src/include/cctk_Misc.h +++ b/src/include/cctk_Misc.h @@ -5,7 +5,7 @@ @desc header file for miscellaneous routines. @enddesc - @version $Id$ + @version $Header$ @@*/ #ifndef _MISC_H_ @@ -29,16 +29,16 @@ int Util_IntInRangeList(int inval, int n_elements, ...); int Util_DoubleInRangeList(double inval, int n_elements, ...); int CCTK_SetDoubleInRangeList(CCTK_REAL *data, const char *value, - int n_elements, ...); + int n_elements, ...); int CCTK_SetIntInRangeList(CCTK_INT *data, const char *value, - int n_elements, ...); + int n_elements, ...); int CCTK_SetKeywordInRangeList(char **data, const char *value, - int n_elements, ...); + int n_elements, ...); int CCTK_SetString(char **data, const char *value); int CCTK_SetBoolean(CCTK_INT *data, const char *value); #ifdef __cplusplus - } +} #endif #endif diff --git a/src/include/cctk_ParameterFunctions.h b/src/include/cctk_ParameterFunctions.h index 59f6f90d..6f25631c 100644 --- a/src/include/cctk_ParameterFunctions.h +++ b/src/include/cctk_ParameterFunctions.h @@ -58,7 +58,7 @@ typedef struct RANGE struct RANGE *next; char *range; char *origin; - int active; + int active; char *description; } t_range; diff --git a/src/include/cctk_Reduction.h b/src/include/cctk_Reduction.h index 7cb83153..63716314 100644 --- a/src/include/cctk_Reduction.h +++ b/src/include/cctk_Reduction.h @@ -5,11 +5,9 @@ @desc Header file for using reduction operators @enddesc + @version $Header$ @@*/ -/* $Id$ */ - - #ifndef _CCTK_REDUCTION_H_ #define _CCTK_REDUCTION_H_ @@ -18,7 +16,7 @@ extern "C" { #endif #define REDUCTION_OPERATOR_REGISTER_ARGLIST \ - cGH *, \ + cGH *, \ int, \ int, \ int, \ @@ -39,12 +37,12 @@ extern "C" { int outType int CCTK_Reduce(cGH *GH, - int proc, - int operation_handle, - int num_out_vals, - int type_out_vals, - void *out_vals, - int num_in_fields, ...); + int proc, + int operation_handle, + int num_out_vals, + int type_out_vals, + void *out_vals, + int num_in_fields, ...); int CCTK_ReductionHandle(const char *reduction); @@ -63,7 +61,7 @@ int CCTK_ReduceLocalScalar (cGH *GH, int proc, int operation_handle, int CCTK_ReduceLocalArray1D (cGH *GH, int proc, int operation_handle, void *in_array1d, void *out_array1d, - int num_in_array1d, int data_type); + int num_in_array1d, int data_type); int CCTK_ReduceArray(cGH *GH, @@ -78,7 +76,7 @@ int CCTK_ReduceArray(cGH *GH, ... ); #ifdef __cplusplus - } +} #endif #endif diff --git a/src/include/cctk_WarnLevel.h b/src/include/cctk_WarnLevel.h index 64f3c718..d4c1d58d 100644 --- a/src/include/cctk_WarnLevel.h +++ b/src/include/cctk_WarnLevel.h @@ -5,6 +5,7 @@ @desc Header for the warning functions. @enddesc + @version $Header$ @@*/ #ifndef _CCTK_WARNLEVEL_H_ @@ -15,10 +16,10 @@ extern "C" { #endif void CCTK_Warn(int level, - int line, - const char *file, - const char *thorn, - const char *message); + int line, + const char *file, + const char *thorn, + const char *message); void CCTK_VWarn(int level, int line, const char *file, diff --git a/src/include/cctki_schedule.h b/src/include/cctki_schedule.h index 2310c852..b709807c 100644 --- a/src/include/cctki_schedule.h +++ b/src/include/cctki_schedule.h @@ -32,19 +32,19 @@ extern "C" { /* Routines to create items */ t_sched_modifier *CCTKi_ScheduleAddModifier(t_sched_modifier *orig, - const char *modifier, - const char *argument); + const char *modifier, + const char *argument); int CCTKi_ScheduleFunction(const char *gname, - const char *fname, - void *func, - t_sched_modifier *modifiers, - void *attributes); + const char *fname, + void *func, + t_sched_modifier *modifiers, + void *attributes); int CCTKi_ScheduleGroup(const char *gname, - const char *thisname, + const char *thisname, t_sched_modifier *modifiers, - void *attributes); + void *attributes); /* Routine to sort the groups - must be called before traversal. */ int CCTKi_ScheduleSortAllGroups(void); diff --git a/src/include/getopt.h b/src/include/getopt.h index 59bc2443..67eb5d7e 100644 --- a/src/include/getopt.h +++ b/src/include/getopt.h @@ -1,3 +1,12 @@ + /*@@ + @header getopt.h + @date 1989 + @author GNU + @desc + GNU getop stuff + @enddesc + @version $Header$ + @@*/ /* Declarations for getopt. Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc. @@ -20,7 +29,7 @@ #ifndef _GETOPT_H #define _GETOPT_H 1 -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -61,9 +70,9 @@ extern int optopt; zero. The field `has_arg' is: - no_argument (or 0) if the option does not take an argument, - required_argument (or 1) if the option requires an argument, - optional_argument (or 2) if the option takes an optional argument. + no_argument (or 0) if the option does not take an argument, + required_argument (or 1) if the option requires an argument, + optional_argument (or 2) if the option takes an optional argument. If the field `flag' is not NULL, it points to a variable that is set to the value given in the field `val' when the option is found, but @@ -78,7 +87,7 @@ extern int optopt; struct option { -#if __STDC__ +#if __STDC__ const char *name; #else char *name; @@ -92,9 +101,9 @@ struct option /* Names for the values of the `has_arg' field of `struct option'. */ -#define no_argument 0 -#define required_argument 1 -#define optional_argument 2 +#define no_argument 0 +#define required_argument 1 +#define optional_argument 2 #if __STDC__ #if defined(__GNU_LIBRARY__) @@ -106,16 +115,16 @@ extern int getopt (int argc, char *const *argv, const char *shortopts); extern int getopt (); #endif /* not __GNU_LIBRARY__ */ extern int getopt_long (int argc, char *const *argv, const char *shortopts, - const struct option *longopts, int *longind); + const struct option *longopts, int *longind); extern int getopt_long_only (int argc, char *const *argv, - const char *shortopts, - const struct option *longopts, int *longind); + const char *shortopts, + const struct option *longopts, int *longind); /* Internal only. Users should not call this directly. */ extern int _getopt_internal (int argc, char *const *argv, - const char *shortopts, - const struct option *longopts, int *longind, - int long_only); + const char *shortopts, + const struct option *longopts, int *longind, + int long_only); #else /* not __STDC__ */ extern int getopt (); extern int getopt_long (); @@ -124,7 +133,7 @@ extern int getopt_long_only (); extern int _getopt_internal (); #endif /* not __STDC__ */ -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/include/gnu_regex.h b/src/include/gnu_regex.h index f84716b9..f7707b9b 100644 --- a/src/include/gnu_regex.h +++ b/src/include/gnu_regex.h @@ -1,11 +1,11 @@ /*@@ @header gnu_regex.h - @date Tue May 25 17:20:09 1999 - @author Tom Goodale + @date 1985 + @author GNU @desc GNU regular expression library. @enddesc - @version $Id$ + @version $Header$ @@*/ /* Definitions for data structures and routines for the regular @@ -157,27 +157,27 @@ extern reg_syntax_t re_syntax_options; /* [[[begin syntaxes]]] */ #define RE_SYNTAX_EMACS 0 -#define RE_SYNTAX_AWK \ - (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \ - | RE_NO_BK_PARENS | RE_NO_BK_REFS \ - | RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \ +#define RE_SYNTAX_AWK \ + (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \ + | RE_NO_BK_PARENS | RE_NO_BK_REFS \ + | RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \ | RE_UNMATCHED_RIGHT_PAREN_ORD) -#define RE_SYNTAX_POSIX_AWK \ +#define RE_SYNTAX_POSIX_AWK \ (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS) -#define RE_SYNTAX_GREP \ - (RE_BK_PLUS_QM | RE_CHAR_CLASSES \ - | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \ +#define RE_SYNTAX_GREP \ + (RE_BK_PLUS_QM | RE_CHAR_CLASSES \ + | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \ | RE_NEWLINE_ALT) -#define RE_SYNTAX_EGREP \ - (RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \ - | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \ - | RE_NEWLINE_ALT | RE_NO_BK_PARENS \ +#define RE_SYNTAX_EGREP \ + (RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \ + | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \ + | RE_NEWLINE_ALT | RE_NO_BK_PARENS \ | RE_NO_BK_VBAR) -#define RE_SYNTAX_POSIX_EGREP \ +#define RE_SYNTAX_POSIX_EGREP \ (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES) /* P1003.2/D11.2, section 4.20.7.1, lines 5078ff. */ @@ -186,32 +186,32 @@ extern reg_syntax_t re_syntax_options; #define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC /* Syntax bits common to both basic and extended POSIX regex syntax. */ -#define _RE_SYNTAX_POSIX_COMMON \ - (RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \ +#define _RE_SYNTAX_POSIX_COMMON \ + (RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \ | RE_INTERVALS | RE_NO_EMPTY_RANGES) -#define RE_SYNTAX_POSIX_BASIC \ +#define RE_SYNTAX_POSIX_BASIC \ (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM) /* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes RE_LIMITED_OPS, i.e., \? \+ \| are not recognized. Actually, this isn't minimal, since other operators, such as \`, aren't disabled. */ -#define RE_SYNTAX_POSIX_MINIMAL_BASIC \ +#define RE_SYNTAX_POSIX_MINIMAL_BASIC \ (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS) -#define RE_SYNTAX_POSIX_EXTENDED \ - (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ - | RE_CONTEXT_INDEP_OPS | RE_NO_BK_BRACES \ - | RE_NO_BK_PARENS | RE_NO_BK_VBAR \ +#define RE_SYNTAX_POSIX_EXTENDED \ + (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ + | RE_CONTEXT_INDEP_OPS | RE_NO_BK_BRACES \ + | RE_NO_BK_PARENS | RE_NO_BK_VBAR \ | RE_UNMATCHED_RIGHT_PAREN_ORD) /* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INVALID_OPS replaces RE_CONTEXT_INDEP_OPS and RE_NO_BK_REFS is added. */ -#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED \ - (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ - | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES \ - | RE_NO_BK_PARENS | RE_NO_BK_REFS \ - | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) +#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED \ + (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ + | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES \ + | RE_NO_BK_PARENS | RE_NO_BK_REFS \ + | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) /* [[[end syntaxes]]] */ /* Maximum number of duplicates an interval can allow. Some systems @@ -260,28 +260,28 @@ extern reg_syntax_t re_syntax_options; `re_error_msg' table in regex.c. */ typedef enum { - REG_NOERROR = 0, /* Success. */ - REG_NOMATCH, /* Didn't find a match (for regexec). */ + REG_NOERROR = 0, /* Success. */ + REG_NOMATCH, /* Didn't find a match (for regexec). */ /* POSIX regcomp return error codes. (In the order listed in the standard.) */ - REG_BADPAT, /* Invalid pattern. */ - REG_ECOLLATE, /* Not implemented. */ - REG_ECTYPE, /* Invalid character class name. */ - REG_EESCAPE, /* Trailing backslash. */ - REG_ESUBREG, /* Invalid back reference. */ - REG_EBRACK, /* Unmatched left bracket. */ - REG_EPAREN, /* Parenthesis imbalance. */ - REG_EBRACE, /* Unmatched \{. */ - REG_BADBR, /* Invalid contents of \{\}. */ - REG_ERANGE, /* Invalid range end. */ - REG_ESPACE, /* Ran out of memory. */ - REG_BADRPT, /* No preceding re for repetition op. */ + REG_BADPAT, /* Invalid pattern. */ + REG_ECOLLATE, /* Not implemented. */ + REG_ECTYPE, /* Invalid character class name. */ + REG_EESCAPE, /* Trailing backslash. */ + REG_ESUBREG, /* Invalid back reference. */ + REG_EBRACK, /* Unmatched left bracket. */ + REG_EPAREN, /* Parenthesis imbalance. */ + REG_EBRACE, /* Unmatched \{. */ + REG_BADBR, /* Invalid contents of \{\}. */ + REG_ERANGE, /* Invalid range end. */ + REG_ESPACE, /* Ran out of memory. */ + REG_BADRPT, /* No preceding re for repetition op. */ /* Error codes we've added. */ - REG_EEND, /* Premature end. */ - REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ - REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ + REG_EEND, /* Premature end. */ + REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ + REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ } reg_errcode_t; /* This data structure represents a compiled pattern. Before calling @@ -293,16 +293,16 @@ typedef enum struct re_pattern_buffer { /* [[[begin pattern_buffer]]] */ - /* Space that holds the compiled pattern. It is declared as + /* Space that holds the compiled pattern. It is declared as `unsigned char *' because its elements are sometimes used as array indexes. */ unsigned char *buffer; - /* Number of bytes to which `buffer' points. */ + /* Number of bytes to which `buffer' points. */ unsigned long allocated; - /* Number of bytes actually used in `buffer'. */ - unsigned long used; + /* Number of bytes actually used in `buffer'. */ + unsigned long used; /* Syntax setting with which the pattern was compiled. */ reg_syntax_t syntax; @@ -318,7 +318,7 @@ struct re_pattern_buffer when it is matched. */ char *translate; - /* Number of subexpressions found by the compiler. */ + /* Number of subexpressions found by the compiler. */ size_t re_nsub; /* Zero if this pattern cannot match the empty string, one else. diff --git a/src/include/rfrConstants.h b/src/include/rfrConstants.h index fb407dbe..0a8eb8d4 100644 --- a/src/include/rfrConstants.h +++ b/src/include/rfrConstants.h @@ -5,9 +5,11 @@ @desc @enddesc + @version $Header$ @@*/ -/* $Id$ */ +#ifndef _RFRCONSTANTS_H +#define _RFRCONSTANTS_H /* Be careful changing ordering. Look at tree in rfrInitialize before you do! */ #define CCTK_PARAMCHECK 0 @@ -46,17 +48,19 @@ extern "C" #endif int rfrInitTree(void **rfr_top, - int (*StorageOn)(void *, int), - int (*StorageOff)(void *, int), - int (*CommunicationOn)(void *, int), - int (*CommunicationOff)(void *, int), - int (*Triggerable)(int), - int (*TriggerSaysGo)(void *, int), - int (*TriggerAction)(void *, int), - int (*CallFunc)(void *, int, void *)); + int (*StorageOn)(void *, int), + int (*StorageOff)(void *, int), + int (*CommunicationOn)(void *, int), + int (*CommunicationOff)(void *, int), + int (*Triggerable)(int), + int (*TriggerSaysGo)(void *, int), + int (*TriggerAction)(void *, int), + int (*CallFunc)(void *, int, void *)); void rfrPrintDescs(void *rfr_top, void *data, int when, char *tag, char *spacing); #ifdef __cplusplus } #endif + +#endif /* _RFRCONSTANTS_H */ -- cgit v1.2.3