Skip to content

Commit

Permalink
Use stdbool instead of our own boolean type.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Subsentient
Subsentient committed Feb 7, 2015
1 parent ce95ec4 commit d19c204
Show file tree
Hide file tree
Showing 11 changed files with 124 additions and 126 deletions.
104 changes: 51 additions & 53 deletions src/aqu4.h
View file
Expand Up @@ -26,9 +26,7 @@ See the file UNLICENSE.TXT for more information.
#define BOT_OS "UNIX"
#endif

/*This is how we do it.*/
typedef signed char Bool;
enum { false, true };
#include <stdbool.h>

/*The commands that are found via IRC.*/
typedef enum
Expand Down Expand Up @@ -59,14 +57,14 @@ struct ChannelTree
char TopicSetter[128];
char CmdPrefix[128];
unsigned long TopicSetTime;
Bool AutoLinkTitle; /*Automatically get link titles?*/
bool AutoLinkTitle; /*Automatically get link titles?*/

struct _UserList
{
char Nick[128];
char Ident[128];
char Mask[128];
Bool FullUser;
bool FullUser;

struct _UserList *Next;
struct _UserList *Prev;
Expand All @@ -85,15 +83,15 @@ struct _ServerInfo
char NickservPwd[256];
char ServerPassword[256];
unsigned short PortNum;
Bool SetBotmode;
bool SetBotmode;
};

struct AuthTree
{
char Nick[128];
char Ident[128];
char Mask[128];
Bool BotOwner;
bool BotOwner;

struct AuthTree *Next;
struct AuthTree *Prev;
Expand All @@ -105,96 +103,96 @@ typedef enum { BLACK = 30, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, ENDCO
extern void Bot_SetTextColor(ConsoleColor Color);

/*config.c*/
extern Bool Config_GetLineData(const char *InStream, char *OutStream, unsigned MaxSize);
extern Bool Config_ReadConfig(void);
extern bool Config_GetLineData(const char *InStream, char *OutStream, unsigned MaxSize);
extern bool Config_ReadConfig(void);

/*netcore.c*/
extern Bool Net_Connect(const char *InHost, unsigned short PortNum, int *SocketDescriptor_);
extern Bool Net_Write(int SockDescriptor, const char *InMsg);
extern Bool Net_Read(int SockDescriptor, void *OutStream_, unsigned MaxLength, Bool TextStream);
extern Bool Net_Disconnect(int SockDescriptor);
extern bool Net_Connect(const char *InHost, unsigned short PortNum, int *SocketDescriptor_);
extern bool Net_Write(int SockDescriptor, const char *InMsg);
extern bool Net_Read(int SockDescriptor, void *OutStream_, unsigned MaxLength, bool TextStream);
extern bool Net_Disconnect(int SockDescriptor);

/*irc.c*/
extern Bool IRC_Connect(void);
extern bool IRC_Connect(void);
extern void IRC_Loop(void);
extern Bool IRC_Quit(const char *QuitMSG);
extern Bool IRC_JoinChannel(const char *Channel);
extern Bool IRC_LeaveChannel(const char *Channel);
extern Bool IRC_Message(const char *Target, const char *Message);
extern Bool IRC_Notice(const char *Target, const char *Notice);
extern Bool IRC_NickChange(const char *Nick);
extern bool IRC_Quit(const char *QuitMSG);
extern bool IRC_JoinChannel(const char *Channel);
extern bool IRC_LeaveChannel(const char *Channel);
extern bool IRC_Message(const char *Target, const char *Message);
extern bool IRC_Notice(const char *Target, const char *Notice);
extern bool IRC_NickChange(const char *Nick);
extern void IRC_Pong(const char *Param);
extern struct ChannelTree *IRC_AddChannelToTree(const char *const Channel, const char *const Prefix);
extern Bool IRC_DelChannelFromTree(const char *Channel);
extern bool IRC_DelChannelFromTree(const char *Channel);
extern void IRC_ShutdownChannelTree(void);
extern MessageType IRC_GetMessageType(const char *InStream_);
extern Bool IRC_GetMessageData(const char *Message, char *OutData);
extern Bool IRC_BreakdownNick(const char *Message, char *NickOut, char *IdentOut, char *MaskOut);
extern Bool IRC_GetStatusCode(const char *Message, int *OutNumber);
extern Bool IRC_AddUserToChannel(const char *Channel, const char *Nick, const char *Ident, const char *Mask, Bool FullUser);
extern Bool IRC_DelUserFromChannel(const char *Channel, const char *Nick);
extern bool IRC_GetMessageData(const char *Message, char *OutData);
extern bool IRC_BreakdownNick(const char *Message, char *NickOut, char *IdentOut, char *MaskOut);
extern bool IRC_GetStatusCode(const char *Message, int *OutNumber);
extern bool IRC_AddUserToChannel(const char *Channel, const char *Nick, const char *Ident, const char *Mask, bool FullUser);
extern bool IRC_DelUserFromChannel(const char *Channel, const char *Nick);
extern void IRC_CompleteChannelUser(const char *const Nick, const char *const Ident, const char *const Mask);
extern Bool IRC_DelUserFromChannelP(struct ChannelTree *const Channel, const char *const Nick);
extern Bool IRC_UserInChannel(const char *Channel, const char *Nick);
extern Bool IRC_UserInChannelP(const struct ChannelTree *Channel, const char *Nick);
extern bool IRC_DelUserFromChannelP(struct ChannelTree *const Channel, const char *const Nick);
extern bool IRC_UserInChannel(const char *Channel, const char *Nick);
extern bool IRC_UserInChannelP(const struct ChannelTree *Channel, const char *Nick);
extern void IRC_ShutdownChannelUsers(struct ChannelTree *Channel);
extern struct ChannelTree *IRC_GetChannelFromDB(const char *const Channel);
extern Bool IRC_StripControlCodes(char *Stream);
extern bool IRC_StripControlCodes(char *Stream);

/*commands.c*/
extern void CMD_ProcessCommand(const char *InStream);
extern Bool CMD_AddToTellDB(const char *Target, const char *Source, const char *Message);
extern Bool CMD_ReadTellDB(const char *Target);
extern bool CMD_AddToTellDB(const char *Target, const char *Source, const char *Message);
extern bool CMD_ReadTellDB(const char *Target);
extern unsigned CMD_AddToStickyDB(const char *Owner, const char *Sticky);
extern void CMD_UpdateSeenDB(long Time, const char *Nick, const char *Channel, const char *LastMessage);
extern Bool CMD_SaveSeenDB(void);
extern bool CMD_SaveSeenDB(void);
extern void CMD_LoadSeenDB(void);
extern void CMD_AddUserMode(const char *Nick, const char *Ident, const char *Mask, const char *Mode,
const char *Target, const char *Channel);
extern Bool CMD_DelUserMode(const char *Nick, const char *Ident, const char *Mask, const char *Mode, const char *Target, const char *Channel);
extern Bool CMD_LoadUserModes(void);
extern Bool CMD_SaveUserModes(void);
extern bool CMD_DelUserMode(const char *Nick, const char *Ident, const char *Mask, const char *Mode, const char *Target, const char *Channel);
extern bool CMD_LoadUserModes(void);
extern bool CMD_SaveUserModes(void);
extern void CMD_ListUserModes(const char *SendTo);
extern void CMD_ProcessUserModes(const char *Nick, const char *Ident, const char *Mask, const char *Channel);

/*auth.c*/
extern Bool Auth_AddAdmin(const char *Nick, const char *Ident, const char *Mask, Bool BotOwner);
extern Bool Auth_DelAdmin(const char *Nick, const char *Ident, const char *Mask, Bool OwnersToo);
extern Bool Auth_IsAdmin(const char *Nick, const char *Ident, const char *Mask, Bool *BotOwner);
extern bool Auth_AddAdmin(const char *Nick, const char *Ident, const char *Mask, bool BotOwner);
extern bool Auth_DelAdmin(const char *Nick, const char *Ident, const char *Mask, bool OwnersToo);
extern bool Auth_IsAdmin(const char *Nick, const char *Ident, const char *Mask, bool *BotOwner);
extern void Auth_ListAdmins(const char *SendTo);
extern void Auth_ShutdownAdmin(void);
extern Bool Auth_IsBlacklisted(const char *Nick, const char *Ident, const char *Mask);
extern Bool Auth_BlacklistDel(const char *Nick, const char *Ident, const char *Mask);
extern Bool Auth_BlacklistAdd(const char *Nick, const char *Ident, const char *Mask);
extern bool Auth_IsBlacklisted(const char *Nick, const char *Ident, const char *Mask);
extern bool Auth_BlacklistDel(const char *Nick, const char *Ident, const char *Mask);
extern bool Auth_BlacklistAdd(const char *Nick, const char *Ident, const char *Mask);
extern void Auth_ShutdownBlacklist(void);
extern void Auth_BlacklistLoad(void);
extern Bool Auth_BlacklistSave(void);
extern bool Auth_BlacklistSave(void);
extern void Auth_BlacklistSendList(const char *SendTo);

/*logging.c*/
extern Bool Log_WriteMsg(const char *InStream, MessageType MType);
extern Bool Log_CoreWrite(const char *InStream, const char *FileTitle);
extern Bool Log_TailLog(const char *const ChannelOrNick, const int NumLinesToOut, char *const OutStream, const int Capacity);
extern bool Log_WriteMsg(const char *InStream, MessageType MType);
extern bool Log_CoreWrite(const char *InStream, const char *FileTitle);
extern bool Log_TailLog(const char *const ChannelOrNick, const int NumLinesToOut, char *const OutStream, const int Capacity);

/*wz.c*/
extern Bool WZ_GetGamesList(const char *Server, unsigned short Port, const char *SendTo, Bool WZLegacy);
extern bool WZ_GetGamesList(const char *Server, unsigned short Port, const char *SendTo, bool WZLegacy);

/*ddg.c*/
extern Bool DDG_Query(const char *Search, const char *SendTo);
extern bool DDG_Query(const char *Search, const char *SendTo);

/*curlcore.c*/
extern Bool CurlCore_GetHTTP(const char *const URL, void *const OutStream, const unsigned MaxOutBytes);
extern bool CurlCore_GetHTTP(const char *const URL, void *const OutStream, const unsigned MaxOutBytes);

/*Various globals.*/
extern int SocketDescriptor;
extern struct _ServerInfo ServerInfo;
extern struct ChannelTree *Channels;
extern char GlobalCmdPrefix[sizeof ((struct ChannelTree*)0)->CmdPrefix];
extern unsigned short SendDelay;
extern Bool ShowOutput;
extern Bool Logging;
extern Bool LogPMs;
extern bool ShowOutput;
extern bool Logging;
extern bool LogPMs;
extern int _argc;
extern char **_argv;
extern struct AuthTree *AdminAuths;
extern Bool NoControlCodes;
extern bool NoControlCodes;
18 changes: 9 additions & 9 deletions src/auth.c
View file
Expand Up @@ -26,7 +26,7 @@ static struct Blacklist
struct Blacklist *Prev;
} *BLCore;

Bool Auth_AddAdmin(const char *Nick, const char *Ident, const char *Mask, Bool BotOwner)
bool Auth_AddAdmin(const char *Nick, const char *Ident, const char *Mask, bool BotOwner)
{
struct AuthTree *Worker = AdminAuths;

Expand Down Expand Up @@ -58,10 +58,10 @@ Bool Auth_AddAdmin(const char *Nick, const char *Ident, const char *Mask, Bool B
return true;
}

Bool Auth_DelAdmin(const char *Nick, const char *Ident, const char *Mask, Bool OwnersToo)
bool Auth_DelAdmin(const char *Nick, const char *Ident, const char *Mask, bool OwnersToo)
{
struct AuthTree *Worker = AdminAuths;
Bool Success = false;
bool Success = false;

if (!Nick && !Ident && !Mask) return false;

Expand Down Expand Up @@ -129,7 +129,7 @@ void Auth_ShutdownAdmin(void)
AdminAuths = NULL;
}

Bool Auth_IsAdmin(const char *Nick, const char *Ident, const char *Mask, Bool *BotOwner)
bool Auth_IsAdmin(const char *Nick, const char *Ident, const char *Mask, bool *BotOwner)
{
struct AuthTree *Worker = AdminAuths;

Expand All @@ -152,10 +152,10 @@ Bool Auth_IsAdmin(const char *Nick, const char *Ident, const char *Mask, Bool *B
/*Beyond this point, stuff for blacklisting.*/


Bool Auth_BlacklistDel(const char *Nick, const char *Ident, const char *Mask)
bool Auth_BlacklistDel(const char *Nick, const char *Ident, const char *Mask)
{
struct Blacklist *Worker = BLCore;
Bool Success = false;
bool Success = false;

if (!BLCore) return false;

Expand Down Expand Up @@ -193,7 +193,7 @@ Bool Auth_BlacklistDel(const char *Nick, const char *Ident, const char *Mask)
return Success;
}

Bool Auth_IsBlacklisted(const char *Nick, const char *Ident, const char *Mask)
bool Auth_IsBlacklisted(const char *Nick, const char *Ident, const char *Mask)
{
struct Blacklist *Worker = BLCore;

Expand All @@ -212,7 +212,7 @@ Bool Auth_IsBlacklisted(const char *Nick, const char *Ident, const char *Mask)
return false;
}

Bool Auth_BlacklistAdd(const char *Nick, const char *Ident, const char *Mask)
bool Auth_BlacklistAdd(const char *Nick, const char *Ident, const char *Mask)
{
struct Blacklist *Worker = BLCore;

Expand Down Expand Up @@ -292,7 +292,7 @@ void Auth_BlacklistLoad(void)
free(BlacklistDB);
}

Bool Auth_BlacklistSave(void)
bool Auth_BlacklistSave(void)
{
FILE *Descriptor = NULL;
struct Blacklist *Worker = BLCore;
Expand Down

0 comments on commit d19c204

Please sign in to comment.