Skip to content

Commit bc7d43b

Browse files
kuronekokuroneko
committed
clean up headers to be C++11/14 compliant. update readme
1 parent 7b885ac commit bc7d43b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+205
-179
lines changed

‎CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(fsd
3-
VERSION 2.99.0
3+
VERSION 3.99.0
44
LANGUAGES C CXX)
55

6-
set(CMAKE_CXX_STANDARD 14)
7-
86
add_executable(fsd
97
fsd/attributes.h
108
fsd/authenticate.c
@@ -49,3 +47,5 @@ add_executable(fsd
4947
fsd/user.h
5048
fsd/wprofile.cpp
5149
fsd/wprofile.h)
50+
set_property(TARGET fsd PROPERTY CXX_STANDARD 14)
51+
set_property(TARGET fsd PROPERTY CXX_STANDARD_REQUIRED ON)

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# FSD
1+
# FSD 4.0
22

33
## History
44

‎fsd/certificate.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
#include <stdio.h>
2-
#include <stdlib.h>
3-
#include <string.h>
1+
#include <cstdio>
2+
#include <cstdlib>
3+
#include <cstring>
4+
45
#include "certificate.h"
56
#include "global.h"
67

7-
char *certlevels[]=
8+
const char *certlevels[]=
89
{
910
"SUSPENDED", "OBSPILOT", "STUDENT1", "STUDENT2", "STUDENT3",
1011
"CONTROLLER1", "CONTROLLER2", "CONTROLLER3", "INSTRUCTOR1",

‎fsd/certificate.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
#ifndef CERTIFICATEHH
2-
#define CERTIFICATEHH
1+
#include <ctime>
32

4-
#include <time.h>
53
#include "interface.h"
64

5+
#ifndef CERTIFICATEHH
6+
#define CERTIFICATEHH
7+
78
#define CERTPILOT 1
89
#define CERTATC 2
910

@@ -18,7 +19,7 @@ class certificate
1819
void configure(char *, int, time_t, char *);
1920
~certificate();
2021
};
21-
extern char *certlevels[];
22+
extern const char *certlevels[];
2223
int maxlevel(char *, char *, int *);
2324
certificate *getcert(char *name);
2425
extern certificate *rootcert;

‎fsd/client.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
#include <stdio.h>
2-
#include <stdlib.h>
1+
#include <cstdio>
2+
#include <cstdlib>
33
#ifndef WIN32
44
#include <unistd.h>
55
#endif
6-
#include <string.h>
7-
#include <math.h>
6+
#include <cstring>
7+
#include <cmath>
8+
89
#include "client.h"
910
#include "cluser.h"
1011
#include "fsd.h"
1112
#include "support.h"
1213
#include "global.h"
14+
1315
client *rootclient=NULL;
1416

1517
client::client(char *i, server *where, char *cs, int t, int reqrating,

‎fsd/client.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
#include <ctime>
2+
3+
#include "server.h"
4+
15
#ifndef CLIENTHH
26
#define CLIENTHH
3-
#include "server.h"
4-
#include <time.h>
57

68
#define CLIENT_PILOT 1
79
#define CLIENT_ATC 2

‎fsd/clinterface.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
#include <stdio.h>
2-
#include <stdlib.h>
1+
#include <cstdio>
2+
#include <cstdlib>
33
#ifndef WIN32
44
#include <unistd.h>
5-
#include <sys/time.h>
65
#endif
7-
#include <time.h>
8-
#include <string.h>
6+
#include <ctime>
7+
#include <cstring>
8+
99
#include "interface.h"
1010
#include "clinterface.h"
1111
#include "global.h"

‎fsd/clinterface.h

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
#ifndef CLINTERFACEHH
2-
#define CLINTERFACEHH
1+
#include <ctime>
32

4-
#include <time.h>
53
#include "interface.h"
64
#include "user.h"
75
#include "client.h"
86
#include "wprofile.h"
7+
8+
#ifndef CLINTERFACEHH
9+
#define CLINTERFACEHH
10+
911
class clinterface:public tcpinterface
1012
{
1113
time_t prevwinddelta;

‎fsd/cluser.cpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
#include <stdio.h>
2-
#include <stdlib.h>
1+
#include <cstdio>
2+
#include <cstdlib>
33
#ifndef WIN32
44
#include <unistd.h>
55
#endif
6-
#include <ctype.h>
7-
#include <string.h>
6+
#include <cctype>
7+
#include <cstring>
8+
89
#include "global.h"
910
#include "cluser.h"
1011
#include "support.h"
@@ -15,7 +16,7 @@
1516
#include "fsdpaths.h"
1617

1718
/* The client communication command names */
18-
char *clcmdnames[]=
19+
const char *clcmdnames[]=
1920
{
2021
"#AA",
2122
"#DA",
@@ -48,7 +49,7 @@ char *clcmdnames[]=
4849
NULL
4950
};
5051

51-
char *errstr[]=
52+
const char *errstr[]=
5253
{
5354
"No error",
5455
"Callsign in use",

‎fsd/cluser.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
#ifndef CLUSERHH
2-
#define CLUSERHH
31
#include "interface.h"
42
#include "clinterface.h"
53
#include "user.h"
64
#include "client.h"
75

6+
#ifndef CLUSERHH
7+
#define CLUSERHH
8+
89
class cluser : public absuser
910
{
1011
clinterface *parent;

‎fsd/config.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
#include <stdio.h>
2-
//#include <unistd.h>
3-
#include <stdlib.h>
4-
#include <string.h>
5-
#include <ctype.h>
1+
#include <cstdio>
2+
#include <cstdlib>
3+
#include <cstring>
4+
#include <cctype>
65
#include <sys/stat.h>
7-
//#include <sys/types.h>
6+
87
#include "manage.h"
98
#include "config.h"
109
#include "support.h"

‎fsd/config.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
#include <ctime>
2+
#include "process.h"
3+
14
#ifndef CONFIGHH
25
#define CONFIGHH
36

4-
#include <time.h>
5-
#include "process.h"
6-
77
#define CONFIGINTERVAL 10
88

99
class configmanager;

‎fsd/fsd.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
#include <stdio.h>
2-
#include <stdlib.h>
3-
#include <string.h>
4-
#include <ctype.h>
1+
#include <cstdio>
2+
#include <cstdlib>
3+
#include <cstring>
4+
#include <cctype>
55
#ifndef WIN32
66
#include <unistd.h>
77
#endif
88
#include <sys/stat.h>
9+
910
#include "fsd.h"
1011
#include "manage.h"
1112
#include "support.h"

‎fsd/fsd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "interface.h"
77
#include "process.h"
88
#include "config.h"
9-
#include <time.h>
9+
#include <ctime>
1010

1111
class fsd
1212
{

‎fsd/global.h

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
#ifndef GLOBALHH
2-
#define GLOBALHH
1+
#include <cmath>
32

4-
/* #include "debug/malloc.h" */
53
#include "manage.h"
6-
//#include "libdbms.h"
74
#include "fsdpaths.h"
85

6+
#ifndef GLOBALHH
7+
#define GLOBALHH
8+
99
#ifdef WIN32
1010
#define STRCASECMP(a,b) _stricmp(a,b)
1111
#define WRITESOCK(a,b,c) send(a,b,c,0)
@@ -65,6 +65,4 @@
6565
#define LEV_ADMINISTRATOR 12
6666
#define LEV_MAX 12
6767

68-
#define M_PI 3.14159265
69-
7068
#endif

‎fsd/interface.cpp

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include <stdio.h>
2-
#include <stdlib.h>
1+
#include <cstdio>
2+
#include <cstdlib>
33
#ifdef WIN32
44
#include <winsock2.h>
55
#else
@@ -10,18 +10,19 @@
1010
#include <netinet/tcp.h>
1111
#include <netdb.h>
1212
#endif
13-
#include <time.h>
14-
#include <ctype.h>
13+
#include <ctime>
14+
#include <cctype>
1515
#include <fcntl.h>
16-
#include <stdarg.h>
17-
#include <string.h>
18-
#include <errno.h>
16+
#include <cstdarg>
17+
#include <cstring>
18+
#include <cerrno>
19+
1920
#include "interface.h"
2021
#include "global.h"
2122
#include "support.h"
2223
#include "user.h"
2324

24-
char *killreasons[]=
25+
const char *killreasons[]=
2526
{
2627
"",
2728
"closed on command",

‎fsd/interface.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
#ifndef INTERFACEHH
2-
#define INTERFACEHH
3-
#include <time.h>
1+
#include <ctime>
42
#include <sys/types.h>
5-
//#include <time.h>
6-
//#include <unistd.h>
3+
74
#include "user.h"
85
#include "process.h"
96

7+
#ifndef INTERFACEHH
8+
#define INTERFACEHH
9+
1010
struct allowstruct
1111
{
1212
allowstruct *next;
@@ -20,7 +20,7 @@ struct guardstruct
2020
int port;
2121
};
2222

23-
extern char *killreasons[];
23+
extern const char *killreasons[];
2424

2525
#define KILL_NONE 0
2626
#define KILL_COMMAND 1

‎fsd/main.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
#include <stdio.h>
2-
#include <stdlib.h>
3-
#include <string.h>
4-
#include <signal.h>
1+
#include <cstdio>
2+
#include <cstdlib>
3+
#include <cstring>
4+
#include <csignal>
55
#ifndef WIN32
66
#include <unistd.h>
77
#include <syslog.h>
88
#include <sys/types.h>
99
#endif
10+
1011
#include "support.h"
1112
#include "fsd.h"
1213
#include "fsdpaths.h"

‎fsd/manage.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#include <string.h>
2-
#include <stdio.h>
3-
#include <stdlib.h>
4-
//#include <unistd.h>
1+
#include <cstring>
2+
#include <cstdio>
3+
#include <cstdlib>
4+
55
#include "global.h"
66
#include "manage.h"
77

‎fsd/manage.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
#include <ctime>
2+
13
#ifndef MANAGEHH
24
#define MANAGEHH
35

4-
#include <time.h>
5-
66
#define ATT_INT 1
77
#define ATT_FLOAT 2
88
#define ATT_MONEY 3

‎fsd/mm.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include <stdio.h>
2-
#include <stdlib.h>
1+
#include <cstdio>
2+
#include <cstdlib>
33
#ifdef WIN32
44
#include <winsock2.h>
55
#else
@@ -9,9 +9,9 @@
99
#include <sys/time.h>
1010
#include <netinet/in.h>
1111
#endif
12-
#include <string.h>
13-
#include <time.h>
14-
#include <errno.h>
12+
#include <cstring>
13+
#include <ctime>
14+
#include <cerrno>
1515
#include <sys/stat.h>
1616
#include "mm.h"
1717
#include "fsd.h"

0 commit comments

Comments
 (0)