github/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename struct exit_status in os_calls

Browse Source 
This conflicts with struct exit_status in <utmp.h>
This commit is contained in:
matt335672
2023-06-29 15:20:39 +01:00
parent 49f60fc64f
commit bc9b35c38c
8 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sesman/sesexec/sesexec.c
+1 -1
View File
@@ -241,7 +241,7 @@ sesexec_terminate_main_loop(int status)
static void
process_sigchld_event(void)
{
struct exit_status e;
struct proc_exit_status e;
int pid;
// Check for any finished children
sesman/sesexec/session.c
+5 -5
View File
@@ -811,11 +811,11 @@ cleanup_sockets(int uid, int display)
/******************************************************************************/
static void
exit_status_to_str(const struct exit_status *e, char buff[], int bufflen)
exit_status_to_str(const struct proc_exit_status *e, char buff[], int bufflen)
{
switch (e->reason)
{
case E_XR_STATUS_CODE:
case E_PXR_STATUS_CODE:
if (e->val == 0)
{
g_snprintf(buff, bufflen, "exit code zero");
@@ -826,7 +826,7 @@ exit_status_to_str(const struct exit_status *e, char buff[], int bufflen)
}
break;
case E_XR_SIGNAL:
case E_PXR_SIGNAL:
{
char sigstr[MAXSTRSIGLEN];
g_snprintf(buff, bufflen, "signal %s",
@@ -844,7 +844,7 @@ exit_status_to_str(const struct exit_status *e, char buff[], int bufflen)
void
session_process_child_exit(struct session_data *sd,
int pid,
const struct exit_status *e)
const struct proc_exit_status *e)
{
if (pid == sd->x_server)
{
@@ -864,7 +864,7 @@ session_process_child_exit(struct session_data *sd,
{
int wm_wait_time = g_time1() - sd->start_time;
if (e->reason == E_XR_STATUS_CODE && e->val == 0)
if (e->reason == E_PXR_STATUS_CODE && e->val == 0)
{
LOG(LOG_LEVEL_INFO,
"Window manager (pid %d, display %d) "
sesman/sesexec/session.h
+2 -2
View File
@@ -35,7 +35,7 @@
#include "xrdp_constants.h"
struct login_info;
struct exit_status;
struct proc_exit_status;
/**
* Information used to start a session
@@ -89,7 +89,7 @@ session_start(struct login_info *login_info,
void
session_process_child_exit(struct session_data *sd,
int pid,
const struct exit_status *e);
const struct proc_exit_status *e);
/**
* Returns a count of active processes in the session
sesman/sesexec/xwait.c
+3 -3
View File
@@ -142,7 +142,7 @@ wait_for_xserver(uid_t uid,
}
else
{
struct exit_status e;
struct proc_exit_status e;
fd[0] = -1; // File descriptor closed by fclose()
log_waitforx_messages(dp);
@@ -150,11 +150,11 @@ wait_for_xserver(uid_t uid,
e = g_waitpid_status(pid);
switch (e.reason)
{
case E_XR_STATUS_CODE:
case E_PXR_STATUS_CODE:
rv = (enum xwait_status)e.val;
break;
case E_XR_SIGNAL:
case E_PXR_SIGNAL:
{
char sigstr[MAXSTRSIGLEN];
LOG(LOG_LEVEL_ERROR,