summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2018-07-10 14:20:43 +0000
committerMatthieu Herrb <matthieu@herrb.eu>2020-07-14 15:52:40 +0200
commit82550d3e45c4df951eb7fc669e6b2d55037cc629 (patch)
treee073f0e3304ea18da7d885551beccc4872122ffa /include
parent21a8da6e18e1b45112fce3520ff91d0fd70813ba (diff)
Consistant use of bool whenever possible.
Diffstat (limited to 'include')
-rw-r--r--include/dm.h10
-rw-r--r--include/dm_auth.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/include/dm.h b/include/dm.h
index 0fdacc4..45c6aa2 100644
--- a/include/dm.h
+++ b/include/dm.h
@@ -53,7 +53,7 @@ from The Open Group.
# include <time.h>
# define Time_t time_t
# include <stdlib.h>
-
+# include <stdbool.h>
# include <X11/Xdmcp.h>
@@ -97,7 +97,7 @@ struct display {
int openTimeout; /* abort open attempt timeout */
int startAttempts; /* number of attempts at starting */
int reservAttempts; /* allowed start-IO error sequences */
- int terminateServer;/* restart for each session */
+ bool terminateServer;/* restart for each session */
int grabServer; /* keep server grabbed for Login */
int grabTimeout; /* time to wait for grab */
int resetSignal; /* signal to reset server */
@@ -118,7 +118,7 @@ struct display {
char *failsafeClient;/* a client to start when the session fails */
/* authorization resources */
- int authorize; /* enable authorization */
+ bool authorize; /* enable authorization */
char **authNames; /* authorization protocol names */
unsigned short *authNameLens; /* authorization protocol name lens */
char *clientAuthFile;/* client specified auth file */
@@ -230,14 +230,14 @@ extern void DeleteXloginResources (struct display *d, Display *dpy);
extern void LoadXloginResources (struct display *d);
extern __dead void ManageSession (struct display *d);
extern void SecureDisplay (struct display *d, Display *dpy);
-extern __dead void SessionExit (struct display *d, int status, int removeAuth);
+extern __dead void SessionExit (struct display *d, int status, bool removeAuth);
extern void SetupDisplay (struct display *d);
extern void UnsecureDisplay (struct display *d, Display *dpy);
extern void execute(char **argv, char **environ);
/* server.c */
extern const char *_SysErrorMsg (int n);
-extern int StartServer (struct display *d);
+extern bool StartServer (struct display *d);
extern int WaitForServer (struct display *d);
extern void ResetServer (struct display *d);
diff --git a/include/dm_auth.h b/include/dm_auth.h
index 533f67d..dfde859 100644
--- a/include/dm_auth.h
+++ b/include/dm_auth.h
@@ -39,10 +39,10 @@ extern void MitInitAuth (unsigned short name_len, char *name);
extern Xauth *MitGetAuth (unsigned short namelen, char *name);
/* auth.c */
-extern int ValidAuthorization (unsigned short name_length, char *name);
+extern bool ValidAuthorization (unsigned short name_length, char *name);
-extern int SaveServerAuthorizations (struct display *d, Xauth **auths, int count);
+extern bool SaveServerAuthorizations (struct display *d, Xauth **auths, int count);
extern void CleanUpFileName (char *src, char *dst, int len);
extern void RemoveUserAuthorization (struct display *d, struct verify_info *verify);
extern void SetAuthorization (struct display *d);