DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Constifying

Browse Source
This commit is contained in:
Pierre Pronchery 2008-04-17 23:00:36 +00:00
parent 27592488b0
commit 530b3f0d58
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/configure.c
View File

@ -286,7 +286,7 @@ static int _configure_do(Configure * configure, configArray * ca)
String * di; String * di;
int j; int j;
Config * cj; Config * cj;
String * dj; String const * dj;
for(i = 0; i < cnt; i++) for(i = 0; i < cnt; i++)
{ {

19
src/configure.h
View File

@ -33,7 +33,8 @@ typedef enum _HostArch
HA_UNKNOWN HA_UNKNOWN
} HostArch; } HostArch;
# define HA_LAST HA_UNKNOWN # define HA_LAST HA_UNKNOWN
extern const String * sHostArch[HA_LAST+1]; # define HA_COUNT (HA_LAST + 1)
extern const String * sHostArch[HA_COUNT];
typedef enum _HostOS typedef enum _HostOS
{ {
@ -43,7 +44,8 @@ typedef enum _HostOS
HO_UNKNOWN HO_UNKNOWN
} HostOS; } HostOS;
# define HO_LAST HO_UNKNOWN # define HO_LAST HO_UNKNOWN
extern const String * sHostOS[HO_LAST+1]; # define HO_COUNT (HO_LAST + 1)
extern const String * sHostOS[HO_COUNT];
typedef enum _HostKernel typedef enum _HostKernel
{ {
@ -54,19 +56,21 @@ typedef enum _HostKernel
HK_UNKNOWN HK_UNKNOWN
} HostKernel; } HostKernel;
# define HK_LAST HK_UNKNOWN # define HK_LAST HK_UNKNOWN
# define HK_COUNT (HK_LAST + 1)
struct HostKernel struct HostKernel
{ {
HostOS os; HostOS os;
const char * version; const char * version;
}; };
extern const struct HostKernel sHostKernel[HK_LAST+1]; extern const struct HostKernel sHostKernel[HK_COUNT];
typedef enum _TargetType typedef enum _TargetType
{ {
TT_BINARY = 0, TT_LIBRARY, TT_OBJECT, TT_UNKNOWN TT_BINARY = 0, TT_LIBRARY, TT_OBJECT, TT_UNKNOWN
} TargetType; } TargetType;
# define TT_LAST TT_UNKNOWN # define TT_LAST TT_UNKNOWN
extern const String * sTargetType[TT_LAST]; # define TT_COUNT (TT_LAST + 1)
extern const String * sTargetType[TT_COUNT];
typedef enum _ObjectType typedef enum _ObjectType
{ {
@ -76,7 +80,8 @@ typedef enum _ObjectType
OT_UNKNOWN OT_UNKNOWN
} ObjectType; } ObjectType;
# define OT_LAST OT_UNKNOWN # define OT_LAST OT_UNKNOWN
extern const String * sObjectType[OT_LAST]; # define OT_COUNT (OT_LAST + 1)
extern const String * sObjectType[OT_COUNT];
String * _source_extension(String * source); String * _source_extension(String * source);
@ -111,7 +116,7 @@ typedef struct _Configure
/* functions */ /* functions */
int configure_error(char const * message, int ret); int configure_error(char const * message, int ret);
int enum_string(int last, const String * strings[], String * str); int enum_string(int last, const String * strings[], String const * str);
int enum_string_short(int last, const String * strings[], String * str); int enum_string_short(int last, const String * strings[], String const * str);
#endif /* !CONFIGURE_CONFIGURE_H */ #endif /* !CONFIGURE_CONFIGURE_H */