Fix type definitions

This commit is contained in:
Stas Degteff 2005-08-26 23:12:29 +00:00
parent 715095934c
commit 12c860a28c
2 changed files with 10 additions and 10 deletions

View File

@ -554,7 +554,7 @@ struct _ovride {
#define MA_SHARED (MA_ECHO | MA_CONF) #define MA_SHARED (MA_ECHO | MA_CONF)
typedef struct _msgarea { struct _msgarea {
word cbArea; /* Length of THIS INDIVIDUAL RECORD 0*/ word cbArea; /* Length of THIS INDIVIDUAL RECORD 0*/
word num_override; /* Number of overrides following this record 2*/ word num_override; /* Number of overrides following this record 2*/

View File

@ -34,7 +34,7 @@
// ------------------------------------------------------------------ // ------------------------------------------------------------------
static bool comment_char = '#'; static char comment_char = '#';
// ------------------------------------------------------------------ // ------------------------------------------------------------------
@ -91,7 +91,7 @@ bool gareafile::ReadHPTLine(FILE* f, std::string* s, bool add, int state) {
else else
*s = p; *s = p;
return true; return true;
} }
@ -285,7 +285,7 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
else { else {
char *opt = key + 1; char *opt = key + 1;
if(strieql(opt, "p") or strieql(opt, "$m") if(strieql(opt, "p") or strieql(opt, "$m")
or strieql(opt, "lr") or strieql(opt, "lw") or strieql(opt, "lr") or strieql(opt, "lw")
or strieql(opt, "dupeCheck") or strieql(opt, "dupehistory") or strieql(opt, "dupeCheck") or strieql(opt, "dupehistory")
@ -293,11 +293,11 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
or strieql(opt, "l") or strieql(opt, "fperm") or strieql(opt, "l") or strieql(opt, "fperm")
or strieql(opt, "fowner") or strnieql(opt, "sbadd(", 6) or strieql(opt, "fowner") or strnieql(opt, "sbadd(", 6)
or strnieql(opt, "sbign(", 6)) { or strnieql(opt, "sbign(", 6)) {
gettok(&key, &val); gettok(&key, &val);
} }
else if(strieql(opt, "a")) { else if(strieql(opt, "a")) {
gettok(&key, &val); gettok(&key, &val);
CfgAddress(key); CfgAddress(key);
aa.aka.set(key); aa.aka.set(key);
@ -313,16 +313,16 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
or strieql(opt, "$") or strieql(opt, "0")) { or strieql(opt, "$") or strieql(opt, "0")) {
} }
else if(strieql(opt, "g")) { else if(strieql(opt, "g")) {
gettok(&key, &val); gettok(&key, &val);
if(isdigit(*key)) if(isdigit(*key))
aa.groupid = 0x8000+atoi(key); aa.groupid = 0x8000+atoi(key);
else if(isalpha(*key)) else if(isalpha(*key))
aa.groupid = toupper(*key); aa.groupid = toupper(*key);
} }
else if (strieql(opt, "d")) { else if (strieql(opt, "d")) {
gettok(&key, &val); gettok(&key, &val);
aa.setdesc(key); aa.setdesc(key);
} }
@ -335,7 +335,7 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
gettok(&key, &val); gettok(&key, &val);
} }
aa.setorigin(origin); aa.setorigin(origin);
switch(aa.type) { switch(aa.type) {