Few uncommon types removed

This commit is contained in:
Ianos Gnatiuc 2005-10-21 00:19:15 +00:00
parent c5734978fa
commit aaf04488fd
8 changed files with 562 additions and 572 deletions

View File

@ -129,12 +129,9 @@ typedef unsigned int uint32_t;
typedef int8_t sbyte; typedef int8_t sbyte;
typedef uint8_t byte; typedef uint8_t byte;
typedef int8_t schar;
typedef uint8_t uchar; typedef uint8_t uchar;
typedef int16_t sword;
typedef uint16_t word; typedef uint16_t word;
typedef int16_t sshort;
typedef uint16_t ushort; typedef uint16_t ushort;
typedef uint32_t dword; typedef uint32_t dword;
@ -142,7 +139,6 @@ typedef uint32_t dword;
typedef uint8_t bit; typedef uint8_t bit;
typedef signed int sint;
typedef unsigned int uint; typedef unsigned int uint;
typedef uint32_t time32_t; /* 32-bit time_t type */ typedef uint32_t time32_t; /* 32-bit time_t type */

View File

@ -165,7 +165,7 @@ typedef word OFS;
// OBSOLETE! Only used for compatibility purposes // OBSOLETE! Only used for compatibility purposes
struct cl_rec { struct cl_rec {
sword priv; int16_t priv;
word max_time; // max cume time per day word max_time; // max cume time per day
word max_call; // max time for one call word max_call; // max time for one call
word max_dl; // max dl kbytes per day word max_dl; // max dl kbytes per day
@ -203,7 +203,7 @@ struct m_pointers {
byte version; /* for safety STABLE */ byte version; /* for safety STABLE */
word heap_offset; /* OFFSET OF BEGINNING OF HEAP! STABLE */ word heap_offset; /* OFFSET OF BEGINNING OF HEAP! STABLE */
byte task_num; /* for multi-tasking systems STABLE */ byte task_num; /* for multi-tasking systems STABLE */
sword com_port; /* Com1=0, Com2=1, etc STABLE */ int16_t com_port; /* Com1=0, Com2=1, etc STABLE */
byte noise_ok; /* If yell noise is currently on STABLE */ byte noise_ok; /* If yell noise is currently on STABLE */
/* Miscellanious system information */ /* Miscellanious system information */
@ -214,8 +214,8 @@ struct m_pointers {
sbyte multitasker; /* flag for DoubleDos (see below) */ sbyte multitasker; /* flag for DoubleDos (see below) */
byte nlver; /* Which nodelist version we use (NLVER_XXX) */ byte nlver; /* Which nodelist version we use (NLVER_XXX) */
sword min_ulist; /* OBSOLETE! Only used for compatibility */ int16_t min_ulist; /* OBSOLETE! Only used for compatibility */
sword max_ulist; /* with Maximus 2.x! */ int16_t max_ulist; /* with Maximus 2.x! */
/* Information about errorlevels */ /* Information about errorlevels */
@ -226,8 +226,8 @@ struct m_pointers {
/* Modem information */ /* Modem information */
sword carrier_mask; int16_t carrier_mask;
sword handshake_mask; int16_t handshake_mask;
/* Log-on information */ /* Log-on information */
@ -250,7 +250,7 @@ struct m_pointers {
word speed_rip; /* min baud for rip graphics */ word speed_rip; /* min baud for rip graphics */
byte rsvd1[2]; /* used to be high_msgarea, begin_msgarea */ byte rsvd1[2]; /* used to be high_msgarea, begin_msgarea */
word unlisted_priv; /* Priv needed to send to unlisted node */ word unlisted_priv; /* Priv needed to send to unlisted node */
sword unlisted_cost; /* Charge to send to unlisted node */ int16_t unlisted_cost; /* Charge to send to unlisted node */
word mc_reply_priv; /* Priv to reply to msg with mailchecker */ word mc_reply_priv; /* Priv to reply to msg with mailchecker */
word mc_kill_priv; /* Priv to kill msg with mailchecker */ word mc_kill_priv; /* Priv to kill msg with mailchecker */
@ -258,7 +258,7 @@ struct m_pointers {
/* Information about file areas */ /* Information about file areas */
sword date_style; /* Used for FILES.BBS display */ int16_t date_style; /* Used for FILES.BBS display */
word rsvd20; /* Reserved (used to be dlall_priv) */ word rsvd20; /* Reserved (used to be dlall_priv) */
word rsvd21; /* Reserved (used to be ulbbs_priv) */ word rsvd21; /* Reserved (used to be ulbbs_priv) */
dword k_free; /* The number of disk space (in K) which * dword k_free; /* The number of disk space (in K) which *
@ -280,7 +280,7 @@ struct m_pointers {
/* Flags for external protocols */ /* Flags for external protocols */
sword protoexit; /* Errorlevel for protocol exit */ int16_t protoexit; /* Errorlevel for protocol exit */
char protoflag[MAX_EXTERNP]; char protoflag[MAX_EXTERNP];
/* General-purpose bit-flags (See FLAGx_xxx definitions above.) */ /* General-purpose bit-flags (See FLAGx_xxx definitions above.) */

View File

@ -37,12 +37,12 @@
// ------------------------------------------------------------------ // ------------------------------------------------------------------
// Pascal types // Pascal types
typedef unsigned char Boolean;
typedef char Char; typedef char Char;
typedef unsigned char Byte; typedef uint8_t Byte;
typedef short Integer; typedef uint8_t Boolean;
typedef unsigned short Word; typedef int16_t Integer;
typedef long LongInt; typedef uint16_t Word;
typedef int32_t LongInt;
// ------------------------------------------------------------------ // ------------------------------------------------------------------

View File

@ -340,10 +340,12 @@ typedef struct {
// Some Pascal types // Some Pascal types
typedef char Char; typedef char Char;
typedef unsigned char Byte; typedef uint8_t Byte;
typedef unsigned short Word; typedef uint8_t Boolean;
typedef signed short Integer; typedef int16_t Integer;
typedef signed long LongInt; typedef uint16_t Word;
typedef int32_t LongInt;
typedef Byte FlagType[4]; typedef Byte FlagType[4];
typedef Char Time[6]; typedef Char Time[6];
typedef Char Date[9]; typedef Char Date[9];

View File

@ -43,12 +43,12 @@
// //
// ------------------------------------------------------------------ // ------------------------------------------------------------------
typedef unsigned char Boolean;
typedef char Char; typedef char Char;
typedef unsigned char Byte; typedef uint8_t Byte;
typedef unsigned short Word; typedef uint8_t Boolean;
typedef signed short Integer; typedef int16_t Integer;
typedef signed long LongInt; typedef uint16_t Word;
typedef int32_t LongInt;
typedef Byte FlagType[4]; typedef Byte FlagType[4];
typedef Char ra_Time[6]; typedef Char ra_Time[6];

View File

@ -33,12 +33,9 @@
#include <os2.h> #include <os2.h>
#else #else
typedef char CHAR; typedef char CHAR;
typedef unsigned char UCHAR; typedef uint8_t UCHAR;
typedef short SHORT; typedef int16_t SHORT;
typedef unsigned short USHORT; typedef uint16_t USHORT;
typedef long LONG;
typedef unsigned long ULONG;
//typedef unsigned char *PSZ;
#endif #endif
@ -316,7 +313,7 @@ struct _msgarea
PADDR addr; PADDR addr;
PADDR feeds; PADDR feeds;
unsigned int number; unsigned int number;
LONG TimeFactor; int32_t TimeFactor;
char *password; char *password;
struct _msgarea *next; struct _msgarea *next;
struct _msgarea *prior; struct _msgarea *prior;
@ -375,7 +372,7 @@ struct _filearea
char *dpath; char *dpath;
char *password; char *password;
char *ftpname; char *ftpname;
LONG TimeFactor; int32_t TimeFactor;
struct _filearea *next; struct _filearea *next;
struct _filearea *prior; struct _filearea *prior;
}; };
@ -445,21 +442,21 @@ typedef struct _GROUP
{ {
PSZ Name; PSZ Name;
PSZ Password; PSZ Password;
LONG Number; int32_t Number;
ULONG Flags; uint32_t Flags;
ULONG MinutesPerDay; uint32_t MinutesPerDay;
ULONG MinutesPerCall; uint32_t MinutesPerCall;
ULONG DaysBeforeExpiration; uint32_t DaysBeforeExpiration;
LONG ExpireToGroup; int32_t ExpireToGroup;
ULONG MaxBankTime; uint32_t MaxBankTime;
ULONG MaxUKPerDay; uint32_t MaxUKPerDay;
ULONG MaxDKPerDay; uint32_t MaxDKPerDay;
ULONG ULDLRatio; uint32_t ULDLRatio;
ULONG RatioCredit; uint32_t RatioCredit;
ULONG Security1; uint32_t Security1;
ULONG Security2; uint32_t Security2;
ULONG Flags1; uint32_t Flags1;
ULONG Flags2; uint32_t Flags2;
int CreditsPerUnit; int CreditsPerUnit;
int CreditsPerUnitPeek; int CreditsPerUnitPeek;
int FreeCreditsDay; int FreeCreditsDay;
@ -467,7 +464,7 @@ typedef struct _GROUP
int FreeCreditsMonth; int FreeCreditsMonth;
int FreeCreditsPercentage; int FreeCreditsPercentage;
int MaxDebt; int MaxDebt;
LONG GroupIfBroke; int32_t GroupIfBroke;
USHORT DaysBetweenPWChange; USHORT DaysBetweenPWChange;
PSZ MainMenu; PSZ MainMenu;
PSZ MainMenuUnVerified; PSZ MainMenuUnVerified;
@ -503,7 +500,7 @@ typedef struct _user_info
CHAR SysOpComment[78]; CHAR SysOpComment[78];
USHORT BankTime; USHORT BankTime;
USHORT computer_type; USHORT computer_type;
ULONG userid; uint32_t userid;
USHORT pointid; USHORT pointid;
time32_t initial_logon; time32_t initial_logon;
time32_t expires; time32_t expires;
@ -513,47 +510,47 @@ typedef struct _user_info
UCHAR birthmonth; UCHAR birthmonth;
UCHAR birthday; UCHAR birthday;
UCHAR Gender; UCHAR Gender;
LONG credit; int32_t credit;
LONG minlimit; // what exactly is this? int32_t minlimit; // what exactly is this?
LONG Group; // must match Group->Number int32_t Group; // must match Group->Number
ULONG CurrLastRead; // last Read for current msg area uint32_t CurrLastRead; // last Read for current msg area
ULONG time_today; // seconds used today uint32_t time_today; // seconds used today
ULONG time_per_day; // minutes allowed per day uint32_t time_per_day; // minutes allowed per day
ULONG time_per_call; // minutes per call 0=just per day uint32_t time_per_call; // minutes per call 0=just per day
ULONG numcalls; uint32_t numcalls;
ULONG ulnum; // files uploaded (ever) uint32_t ulnum; // files uploaded (ever)
ULONG dlnum; // files downloaded (ever) uint32_t dlnum; // files downloaded (ever)
ULONG ulk; // UL in K (ever) uint32_t ulk; // UL in K (ever)
ULONG dlk; // DL in K (ever) uint32_t dlk; // DL in K (ever)
ULONG uktoday; // UL in K Today uint32_t uktoday; // UL in K Today
ULONG dktoday; // DL in K Today uint32_t dktoday; // DL in K Today
ULONG ukperday; // Max UL K Per day uint32_t ukperday; // Max UL K Per day
ULONG dkperday; // Max DL K Per day uint32_t dkperday; // Max DL K Per day
ULONG numposts; uint32_t numposts;
ULONG security1; uint32_t security1;
ULONG security2; uint32_t security2;
ULONG flags1; uint32_t flags1;
ULONG flags2; uint32_t flags2;
ULONG attribs; uint32_t attribs;
ULONG attribs2; uint32_t attribs2;
USHORT length; USHORT length;
USHORT width; USHORT width;
USHORT lastmsgarea; USHORT lastmsgarea;
USHORT lastfilearea; USHORT lastfilearea;
UCHAR lastprotocol; UCHAR lastprotocol;
UCHAR lastarchiver; UCHAR lastarchiver;
LONG forsysop; int32_t forsysop;
UCHAR interface; UCHAR interface;
UCHAR exp; UCHAR exp;
USHORT leech_percent; USHORT leech_percent;
USHORT MaxBankTime; USHORT MaxBankTime;
SHORT TimeCredit; // can be negative or positive SHORT TimeCredit; // can be negative or positive
SHORT CallsToday; SHORT CallsToday;
LONG TotalMinsEver; int32_t TotalMinsEver;
LONG NetmailDebits; int32_t NetmailDebits;
time32_t LastPWChange; time32_t LastPWChange;
time32_t LastListedNewFiles; //JM940822 time32_t LastListedNewFiles; //JM940822
ULONG FileKCredit; uint32_t FileKCredit;
CHAR UnixId[8]; CHAR UnixId[8];
CHAR Country[24]; CHAR Country[24];
USHORT weight; USHORT weight;
@ -567,8 +564,8 @@ typedef struct _user_info
CHAR POPServer[128]; CHAR POPServer[128];
CHAR NoLongerUsed[22]; CHAR NoLongerUsed[22];
UCHAR _UnUsedOldTags[256]; UCHAR _UnUsedOldTags[256];
ULONG PasswordCRC; uint32_t PasswordCRC;
ULONG PasswordCRC2; uint32_t PasswordCRC2;
USHORT Max_Mail_Pkt; USHORT Max_Mail_Pkt;
CHAR ReAsked; // TRUE if reasked question were answered CHAR ReAsked; // TRUE if reasked question were answered
USHORT timeout; USHORT timeout;
@ -589,14 +586,14 @@ typedef struct _xmsg
CHAR subj[70]; CHAR subj[70];
CHAR date[35]; /* */ CHAR date[35]; /* */
CHAR indate[4]; /* import date (YMD(null)) */ CHAR indate[4]; /* import date (YMD(null)) */
ULONG msgnum; uint32_t msgnum;
ULONG timesread; uint32_t timesread;
time32_t timerecv; time32_t timerecv;
ULONG length; /* Length of message */ uint32_t length; /* Length of message */
LONG start; /* Starting postition in text file */ int32_t start; /* Starting postition in text file */
ULONG OrigMsg; uint32_t OrigMsg;
ULONG miscdatlen; uint32_t miscdatlen;
ULONG miscdatstart; uint32_t miscdatstart;
USHORT o_zone; USHORT o_zone;
USHORT o_net; USHORT o_net;
USHORT o_node; USHORT o_node;
@ -608,8 +605,8 @@ typedef struct _xmsg
USHORT cost; /* Unit cost charged to send the message */ USHORT cost; /* Unit cost charged to send the message */
USHORT fflags; /* Attribute (behavior) of the message */ USHORT fflags; /* Attribute (behavior) of the message */
USHORT xflags; /* Extra attributes */ USHORT xflags; /* Extra attributes */
ULONG bflags; uint32_t bflags;
ULONG cflags; uint32_t cflags;
} XMSG, *PXMSG; } XMSG, *PXMSG;
#endif #endif

View File

@ -36,9 +36,7 @@ typedef uint8_t bit;
typedef int8_t sbyte; typedef int8_t sbyte;
typedef uint8_t byte; typedef uint8_t byte;
typedef int16_t sword;
typedef uint16_t word; typedef uint16_t word;
typedef int16_t sshort;
typedef uint16_t ushort; typedef uint16_t ushort;
typedef uint32_t dword; typedef uint32_t dword;

View File

@ -68,7 +68,6 @@ typedef unsigned int uint32_t;
#include <stdint.h> #include <stdint.h>
#endif //#ifdef _MSC_VER #endif //#ifdef _MSC_VER
typedef signed int sint;
typedef unsigned int uint; typedef unsigned int uint;
typedef uint8_t bit; typedef uint8_t bit;
@ -76,9 +75,7 @@ typedef uint8_t bit;
typedef int8_t sbyte; typedef int8_t sbyte;
typedef uint8_t byte; typedef uint8_t byte;
typedef int16_t sword;
typedef uint16_t word; typedef uint16_t word;
typedef int16_t sshort;
typedef uint16_t ushort; typedef uint16_t ushort;
typedef uint32_t dword; typedef uint32_t dword;