Standardise header include guards

Tokens that begin with two underscores __* or an underscore and an uppercase letter _X* are reserved,
so we should avoid those for our own include guards.  The standard I'm settling on for foo.h is FOO_H_.
This commit is contained in:
Kevin Easton 2017-05-10 23:30:11 +10:00
parent a329dd8404
commit 3f87eb31b1
55 changed files with 151 additions and 201 deletions

View File

@ -9,9 +9,8 @@
*
* @(#)$Id$
*/
#ifndef _ALIAS_H_
#define _ALIAS_H_
#ifndef ALIAS_H_
#define ALIAS_H_
#include "irc_std.h"
@ -143,4 +142,4 @@ extern void do_stack_alias (int, char *, int);
char *BX_next_unit (char *, const char *, int *, int);
char *BX_alias_special_char(char **buffer, char *ptr, const char *args, char *quote_em, int *args_flag);
#endif /* _ALIAS_H_ */
#endif /* ALIAS_H_ */

View File

@ -6,9 +6,8 @@
* See the COPYRIGHT file for copyright information
*
*/
#ifndef ARRAY_H
#define ARRAY_H
#ifndef ARRAY_H_
#define ARRAY_H_
#include "irc_std.h"

View File

@ -36,9 +36,8 @@
* from: @(#)glob.h 8.1 (Berkeley) 6/2/93
* $Id$
*/
#ifndef _GLOB_H_
#define _GLOB_H_
#ifndef BSDGLOB_H_
#define BSDGLOB_H_
struct stat;
typedef struct {
@ -83,4 +82,4 @@ typedef struct {
int BX_bsd_glob (const char *, int, int (*)(const char *, int), glob_t *);
void BX_bsd_globfree (glob_t *);
#endif /* !_GLOB_H_ */
#endif /* BSDGLOB_H_ */

View File

@ -1,5 +1,5 @@
#ifndef _CDCC_H_
#define _CDCC_H_
#ifndef CDCC_H_
#define CDCC_H_
#include <sys/types.h>
#include <sys/stat.h>

View File

@ -1,18 +1,14 @@
/* $Id$ */
/*
* cdns.h: header for cdns.c
*/
#ifndef _CDNS_H_
#define _CDNS_H_
#ifndef CDNS_H_
#define CDNS_H_
/* We gotta know about the fd_set type, so we gonna inclue this */
#include "irc.h"
#include "struct.h"
#include "newio.h"
#endif
#define MAXALIASES 35
#define MAXADDRS 35
@ -91,3 +87,4 @@ void freemyhostent(my_hostent *freeme);
#define Q_NEXT(tmp) ((tmp)->next)
#define Q_OPEN(headp, tailp) (*(headp) = *(tailp) = NULL)
#endif

View File

@ -1,5 +1,5 @@
#ifndef __cdrom_h_
#define __cdrom_h_
#ifndef CDROM_H_
#define CDROM_H_
#ifndef __FreeBSD__
#include <mntent.h>
@ -64,4 +64,4 @@ struct cdrom_etocentry
#define CDROMVOLREAD CDIOCGETVOL
#endif /* __FreeBSD__ */
#endif /* cdrom.h */
#endif /* CDROM_H_ */

View File

@ -3,9 +3,8 @@
*
*
*/
#ifndef __chelp_h
#define __chelp_h
#ifndef CHELP_H_
#define CHELP_H_
extern void chelp (char *, char *, char *, char *);

View File

@ -1,6 +1,5 @@
#ifndef _INC_COLOR
#define _INC_COLOR
#ifndef COLOR_H_
#define COLOR_H_
/*
* DEFAULT_DOUBLE STATUS can be defined as 0 or 1

View File

@ -1,9 +1,9 @@
/*
* edit.h: header for edit.c
* commands.h: header for commands.c
*
*/
#ifndef __edit_h_
#define __edit_h_
#ifndef COMMANDS_H_
#define COMMANDS_H_
#include "irc_std.h"
@ -298,4 +298,4 @@ extern int continue_exception;
extern int return_exception;
#endif /* __edit_h_ */
#endif /* COMMANDS_H_ */

View File

@ -13,9 +13,8 @@
*
* @(#)$Id$
*/
#ifndef __config_h_
#define __config_h_
#ifndef CONFIG_H_
#define CONFIG_H_
#include "defs.h"
@ -689,4 +688,4 @@
#include "color.h" /* all color options here. */
#endif /* __config_h_ */
#endif /* CONFIG_H_ */

View File

@ -1,9 +1,8 @@
/*
* cset.h: header for cset.c
*/
#ifndef _CSET_H_
#define _CSET_H_
#ifndef CSET_H_
#define CSET_H_
#include "struct.h"
/* This ensures we always have the offsetof() macro */
@ -443,4 +442,4 @@ void check_channel_limit(ChannelList *chan);
void add_numeric_fset(char *name, int remove, char *args, int);
char *find_numeric_fset(int numeric);
#endif /* _CSETS_H_ */
#endif /* CSET_H_ */

View File

@ -9,9 +9,8 @@
*
* @(#)$Id$
*/
#ifndef _CTCP_H_
#define _CTCP_H_
#ifndef CTCP_H_
#define CTCP_H_
#include "irc.h"
#include "irc_std.h"
@ -76,4 +75,4 @@ extern int get_ctcp_val (char *);
void BX_split_CTCP (char *, char *, char *);
#endif /* _CTCP_H_ */
#endif /* CTCP_H_ */

View File

@ -4,9 +4,8 @@
* Copyright(c) 1998 Colten Edwards
*
*/
#ifndef __dcc_h_
#define __dcc_h_
#ifndef DCC_H_
#define DCC_H_
#include "struct.h"
@ -172,4 +171,4 @@ struct dcc_offer {
#define DCC_STRUCT_TYPE 0xdcc0dcc0
#endif /* __dcc_h_ */
#endif /* DCC_H_ */

View File

@ -2,8 +2,8 @@
* debug.h -- the runtime debug settings. Can also be done on command line.
*/
#ifndef __X_DEBUG_H__
#define __X_DEBUG_H__
#ifndef DEBUG_H_
#define DEBUG_H_
extern unsigned long x_debug;
extern unsigned long internal_debug;

View File

@ -1,5 +1,5 @@
/*
* crypt.h: header for crypt.c
* encrypt.h: header for encrypt.c
*
* Written By Michael Sandrof
*
@ -9,9 +9,8 @@
*
* @(#)$Id$
*/
#ifndef __CRYPT_H_
#define __CRYPT_H_
#ifndef ENCRYPT_H_
#define ENCRYPT_H_
char *crypt_msg (char *, char *);
char *decrypt_msg (char *, char *);
@ -23,4 +22,4 @@
#define CRYPT_HEADER ""
#define CRYPT_HEADER_LEN 5
#endif /* __crypt_h_ */
#endif /* ENCRYPT_H_ */

View File

@ -5,9 +5,8 @@
* Copyright 1997 EPIC Software Labs
* See the Copyright file for license information
*/
#ifndef __exec_h__
#define __exec_h__
#ifndef EXEC_H_
#define EXEC_H_
void execcmd (char *, char *, char *, char *);
void do_processes (fd_set *);
@ -22,4 +21,4 @@
int logical_to_index (const char *logical);
void kill_process (int, int);
#endif /* _EXEC_H_ */
#endif /* EXEC_H_ */

View File

@ -3,9 +3,8 @@
*
* @(#)$Id$
*/
#ifndef __flood_h_
#define __flood_h_
#ifndef FLOOD_H_
#define FLOOD_H_
enum flood_type {
MSG_FLOOD,
@ -34,4 +33,4 @@ void clean_flood_list(void);
#define FLOOD_HASHSIZE 31
extern HashEntry no_flood_list[FLOOD_HASHSIZE];
#endif /* __flood_h_ */
#endif /* FLOOD_H_ */

View File

@ -9,9 +9,8 @@
*
* @(#)$Id$
*/
#ifndef __funny_h_
#define __funny_h_
#ifndef FUNNY_H_
#define FUNNY_H_
#define FUNNY_PUBLIC 1
#define FUNNY_PRIVATE 2
@ -32,4 +31,4 @@
void funny_namreply (char *, char **);
void update_user_mode (char *);
#endif /* __funny_h_ */
#endif /* FUNNY_H_ */

View File

@ -1,5 +1,5 @@
#ifndef _GTK_BITCHX_
#define _GTK_BITCHX_
#ifndef GTKBITCHX_H_
#define GTKBITCHX_H_
#if defined(GUI)
#ifdef __linux__

View File

@ -1,6 +1,5 @@
#ifndef _GUI_H_
#define _GUI_H_
#ifndef GUI_H_
#define GUI_H_
#ifdef GUI
#define GUISUBMENU 1

View File

@ -9,9 +9,8 @@
*
* @(#)$Id$
*/
#ifndef _HASH2_H_
#define _HASH2_H_
#ifndef HASH2_H_
#define HASH2_H_
#include "struct.h"
#include "whowas.h"

View File

@ -7,10 +7,9 @@
*
* @(#)$Id$
*/
#ifndef __help_h
# define __help_h
#ifndef HELP_H_
#define HELP_H_
void help (char *, char *, char *, char *);
#endif /* __help_h */
#endif /* HELP_H_ */

View File

@ -7,9 +7,8 @@
*
* @(#)$Id$
*/
#ifndef __history_h__
#define __history_h__
#ifndef HISTORY_H_
#define HISTORY_H_
BUILT_IN_COMMAND(history);
void set_history_size (Window *, char *, int);
@ -23,4 +22,4 @@
#define NEXT 0
#define PREV 1
#endif /* _HISTORY_H_ */
#endif /* HISTORY_H_ */

View File

@ -9,9 +9,8 @@
*
* @(#)$Id$
*/
#ifndef __hold_h_
#define __hold_h_
#ifndef HOLD_H_
#define HOLD_H_
void remove_from_hold_list (Window *);
void add_to_hold_list (Window *, char *, int);
@ -22,4 +21,4 @@
int hold_queue_logged (Window *);
void toggle_stop_screen (char, char *);
#endif /* __hold_h_ */
#endif /* HOLD_H_ */

View File

@ -5,9 +5,8 @@
*
* @(#)$Id$
*/
#ifndef __hook_h_
# define __hook_h_
#ifndef HOOK_H_
#define HOOK_H_
enum HOOK_TYPES {
ACTION_LIST,
@ -182,4 +181,4 @@ enum HOOK_TYPES {
void do_stack_on (int, char *);
extern HookFunc hook_functions[];
#endif /* __hook_h_ */
#endif /* HOOK_H_ */

View File

@ -7,9 +7,8 @@
*
* @(#)$Id$
*/
#ifndef __if_h
# define __if_h
#ifndef IF_H_
#define IF_H_
void ifcmd (char *, char *, char *, char *);
void whilecmd (char *, char *, char *, char *);
@ -23,4 +22,4 @@
extern char * next_expr (char **, char);
extern char * next_expr_failok (char **, char);
#endif /* __if_h */
#endif /* IF_H_ */

View File

@ -7,9 +7,8 @@
*
* See the COPYRIGHT file, or do a HELP IRCII COPYRIGHT
*/
#ifndef __ignore_h_
#define __ignore_h_
#ifndef IGNORE_H_
#define IGNORE_H_
/* Type of ignored nicks */
#define IGNORE_MSGS 0x0001
@ -65,4 +64,4 @@ char *get_ignore_types (Ignore *tmp);
char *get_ignore_types_by_pattern (char *pattern);
char *get_ignore_patterns_by_type (char *ctype);
#endif /* __ignore_h_ */
#endif /* IGNORE_H_ */

View File

@ -9,9 +9,9 @@
*
* @(#)$Id$
*/
#ifndef INPUT_H_
#define INPUT_H_
#ifndef __input_h_
#define __input_h_
char input_pause (char *);
void BX_set_input (char *);
void BX_set_input_prompt (Window *, char *, int);
@ -178,4 +178,4 @@ extern NickTab *autoreply_array;
void wm_process(int param);
#endif
#endif /* __input_h_ */
#endif /* INPUT_H_ */

View File

@ -8,9 +8,9 @@
*
* @(#)$Id$
*/
#ifndef IRC_H_
#define IRC_H_
#ifndef __irc_h
#define __irc_h
#define IRCII_COMMENT "\002 Keep it to yourself!\002"
#define BUG_EMAIL "<bitchx-devel@lists.sourceforge.net>"
@ -353,4 +353,4 @@ void initsetproctitle(int, char **, char **);
void setproctitle(const char *, ...);
#endif
#endif /* __irc_h */
#endif /* IRC_H_ */

View File

@ -5,9 +5,8 @@
* Copyright 1997 EPIC Software Labs
* See the COPYRIGHT file, or do a HELP IRCII COPYRIGHT
*/
#ifndef __keys_h__
#define __keys_h__
#ifndef KEYS_H_
#define KEYS_H_
/* I hate typedefs... */
typedef void (*KeyBinding) (char, char *);
@ -52,4 +51,4 @@ enum MOUSE_ACTIONS {
};
#endif
#endif /* _KEYS_H_ */
#endif /* KEYS_H_ */

View File

@ -9,9 +9,8 @@
*
* @(#)$Id$
*/
#ifndef __lastlog_h_
#define __lastlog_h_
#ifndef LASTLOG_H_
#define LASTLOG_H_
#define LOG_NONE 0x00000000
#define LOG_CURRENT 0x00000000
@ -88,4 +87,4 @@ void free_lastlog(Window *);
int logmsg(unsigned long log_type, const char *from, int flag, const char *format, ...);
void reset_hold_mode(Window *);
#endif /* __lastlog_h_ */
#endif /* LASTLOG_H_ */

View File

@ -9,9 +9,8 @@
*
* @(#)$Id$
*/
#ifndef __list_h_
#define __list_h_
#ifndef LIST_H_
#define LIST_H_
void BX_add_to_list (List **, List *);
List *BX_find_in_list (List **, char *, int);
@ -27,4 +26,4 @@
#define REMOVE_FROM_LIST 1
#define USE_WILDCARDS 1
#endif /* __list_h_ */
#endif /* LIST_H_ */

View File

@ -9,9 +9,8 @@
*
* @(#)$Id$
*/
#ifndef __log_h_
#define __log_h_
#ifndef LOG_H_
#define LOG_H_
void do_log (int, char *, FILE **);
void logger (Window *, char *, int);
@ -19,4 +18,4 @@
void BX_add_to_log (FILE *, time_t, const char *, int mangler);
#endif /* __log_h_ */
#endif /* LOG_H_ */

View File

@ -9,11 +9,10 @@
*
* @(#)$Id$
*/
#ifndef __mail_h_
#define __mail_h_
#ifndef MAIL_H_
#define MAIL_H_
char *check_mail (void);
int check_mail_status (void);
#endif /* __mail_h_ */
#endif /* MAIL_H_ */

View File

@ -2,9 +2,8 @@
* Copyright Colten Edwards 1997.
* various miscellaneous routines needed for irc functions
*/
#ifndef _misc_h
#define _misc_h
#ifndef MISC_H_
#define MISC_H_
#define KICKLIST 0x01
#define LEAVELIST 0x02

View File

@ -2,9 +2,8 @@
* Module/dll handling code written by Colten Edwards.
* Copyright 1997
*/
#ifndef _MODULE_H
#define _MODULE_H
#ifndef MODULE_H_
#define MODULE_H_
/*

View File

@ -9,9 +9,8 @@
*
* @(#)$Id$
*/
#ifndef __names_h_
#define __names_h_
#ifndef NAMES_H_
#define NAMES_H_
#include "window.h"
#include "irc.h"
@ -97,4 +96,4 @@ int BX_got_ops(int, ChannelList *);
void BX_flush_channel_stats (void);
char *BX_get_channel_bans(char *, int, int);
#endif /* __names_h_ */
#endif /* NAMES_H_ */

View File

@ -4,9 +4,8 @@
* Copyright 1990, 1995 Michael Sandrof, Matthew Green
* Copyright 1997 EPIC Software Labs
*/
#ifndef __newio_h__
#define __newio_h__
#ifndef NEWIO_H_
#define NEWIO_H_
#include "ssl.h"

View File

@ -1,6 +1,5 @@
#ifndef _NOTICE_H
#define _NOTICE_H
#ifndef NOTICE_H_
#define NOTICE_H_
#ifdef WANT_OPERVIEW
#undef NEWNET_IRCOP

View File

@ -9,11 +9,10 @@
*
* @(#)$Id$
*/
#ifndef __numbers_h_
#define __numbers_h_
#ifndef NUMBERS_H_
#define NUMBERS_H_
char *numeric_banner(void);
void numbered_command(char *, int, char **);
#endif /* __numbers_h_ */
#endif /* NUMBERS_H_ */

View File

@ -9,9 +9,8 @@
*
* @(#)$Id$
*/
#ifndef __output_h_
#define __output_h_
#ifndef OUTPUT_H_
#define OUTPUT_H_
void put_echo (char *);
void BX_put_it (const char *, ...);
@ -39,4 +38,4 @@
extern FILE *irclog_fp;
#endif /* __output_h_ */
#endif /* OUTPUT_H_ */

View File

@ -6,9 +6,8 @@
*
* @(#)$Id$
*/
#ifndef __parse_h_
#define __parse_h_
#ifndef PARSE_H_
#define PARSE_H_
typedef struct {
const char *command;
@ -48,4 +47,4 @@ extern int doing_privmsg;
#define MAXPARA 15
#endif /* __parse_h_ */
#endif /* PARSE_H_ */

View File

@ -7,10 +7,9 @@
*
* @(#)$Id$
*/
#ifndef __queue_h
# define __queue_h
#ifndef QUEUE_H_
#define QUEUE_H_
void queuecmd (char *, char *, char *, char *);
#endif /* __queue_h */
#endif /* QUEUE_H_ */

View File

@ -9,9 +9,8 @@
*
* @(#)$Id$
*/
#ifndef __screen_h_
#define __screen_h_
#ifndef SCREEN_H_
#define SCREEN_H_
#include "window.h"
@ -77,4 +76,4 @@ extern Window *debugging_window;
extern int strip_ansi_never_xlate;
#endif /* __screen_h_ */
#endif /* SCREEN_H_ */

View File

@ -1,7 +1,7 @@
#if defined(HAVE_LIBSSL) && !defined(IN_MODULE)
#ifndef SSL_H_
#define SSL_H_
#ifndef __ssl_h__
#define __ssl_h__
#if defined(HAVE_LIBSSL) && !defined(IN_MODULE)
#include <openssl/crypto.h>
#include <openssl/x509.h>

View File

@ -7,9 +7,8 @@
*
* @(#)$Id$
*/
#ifndef __stack_h_
# define __stack_h_
#ifndef STACK_H_
#define STACK_H_
#include "hook.h"
#include "alias.h"
@ -46,4 +45,4 @@ typedef struct aliasstacklist1
struct aliasstacklist1 *next;
} AliasStack1;
#endif /* __stack_h_ */
#endif /* STACK_H_ */

View File

@ -9,9 +9,8 @@
*
* @(#)$Id$
*/
#ifndef __status_h_
#define __status_h_
#ifndef STATUS_H_
#define STATUS_H_
void make_status (Window *);
void set_alarm (Window *, char *, int);
@ -23,4 +22,4 @@
#define GET_TIME 1
#define RESET_TIME 2
#endif /* __status_h_ */
#endif /* STATUS_H_ */

View File

@ -3,9 +3,8 @@
* CopyRight Colten Edwards Oct 96
*
*/
#ifndef _IRCTCL_H
#define _IRCTCL_H
#ifndef TCL_BX_H_
#define TCL_BX_H_
int handle_dcc_bot (int, char *);
int handle_tcl_chan (int, char *, char *, char *);

View File

@ -2,9 +2,8 @@
* timer.h: header for timer.c
* See the COPYRIGHT file, or do a HELP IRCII COPYRIGHT
*/
#ifndef _TIMER_H_
#define _TIMER_H_
#ifndef TIMER_H_
#define TIMER_H_
/* functions that may be called by others */
extern void timercmd (char *, char *, char *, char *);
@ -21,4 +20,4 @@ char *tcl_add_timer (TimerList **, long, char *, unsigned long);
int tcl_remove_timer (TimerList **, unsigned long);
int timer_callback_exists(void *);
#endif /* _TIMER_H_ */
#endif /* TIMER_H_ */

View File

@ -5,9 +5,8 @@
*
* @(#)$Id$
*/
#ifndef __translat_h_
#define __translat_h_
#ifndef TRANSLAT_H_
#define TRANSLAT_H_
void set_translation (Window *, char *, int);
void enter_digraph (char, char *);
@ -27,4 +26,4 @@ extern unsigned char dig_table_di[DIG_TABLE_SIZE];
extern char digraph_hit;
extern unsigned char digraph_first;
#endif /* __translat_h_ */
#endif /* TRANSLAT_H_ */

View File

@ -3,9 +3,8 @@
* Copyright Colten Edwards 1996
*
*/
#ifndef _user_list_h
#define _user_list_h
#ifndef USERLIST_H_
#define USERLIST_H_
void add_shit (char *, char *, char *, char *);
void add_user (char *, char *, char *, char *);
@ -84,4 +83,3 @@ unsigned long convert_str_to_flags(char *);
int change_pass(char *, char *);
#endif

View File

@ -5,9 +5,8 @@
*
* @(#)$Id$
*/
#ifndef __vars_h_
#define __vars_h_
#ifndef VARS_H_
#define VARS_H_
/* indexes for the irc_variable array */
@ -426,4 +425,4 @@ extern int loading_global;
int parse_mangle (char *, int, char **);
#endif /* __vars_h_ */
#endif /* VARS_H_ */

View File

@ -2,9 +2,8 @@
* who.h -- header info for the WHO, ISON, and USERHOST queues.
* Copyright 1996 EPIC Software Labs
*/
#ifndef __who_h__
#define __who_h__
#ifndef WHO_H_
#define WHO_H_
void clean_server_queues (int);

View File

@ -1,6 +1,5 @@
#ifndef _WhoWas_h
#define _WhoWas_h
#ifndef WHOWAS_H_
#define WHOWAS_H_
#define WHOWAS_USERLIST_MAX 300
#define WHOWAS_REG_MAX 500

View File

@ -9,9 +9,8 @@
*
* @(#)$Id$
*/
#ifndef __window_h_
#define __window_h_
#ifndef WINDOW_H_
#define WINDOW_H_
#include "irc_std.h"
#include "lastlog.h"
@ -173,4 +172,4 @@ BUILT_IN_WINDOW(window_server);
#define WINDOW_NOTIFY ((unsigned) 0x0001)
#define WINDOW_NOTIFIED ((unsigned) 0x0002)
#endif /* __window_h_ */
#endif /* WINDOW_H_ */