external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

Kill lots of warnings in DtSvc.

Browse source
This commit is contained in:
Pascal Stumpf 2013-07-21 22:55:09 +02:00 committed by Jon Trulson
parent 0d7568e843
commit 8f98ac92cd
42 changed files with 275 additions and 185 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cde/lib/DtSvc/DtEncap/MemoryMgr.c
View file

@ -36,6 +36,8 @@
#include "/usr/include/apollo/shlib.h" #include "/usr/include/apollo/shlib.h"
#endif #endif
#include <Dt/UserMsg.h>
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */ #include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
#include <bms/bms.h> #include <bms/bms.h>
@ -55,8 +57,8 @@ void * XeMalloc( size_t size )
XeString ptr; XeString ptr;
if (!size) return 0; if (!size) return 0;
if (ptr = malloc(size)) { if ((ptr = malloc(size))) {
*ptr = (XeChar)NULL; /* Force first byte to NULL for bozos who */ *ptr = (XeChar)0; /* Force first byte to NULL for bozos who */
/* think malloc zeros memory! */ /* think malloc zeros memory! */
return ptr; return ptr;
} }

2
cde/lib/DtSvc/DtEncap/Symbolic.c
View file

@ -36,6 +36,8 @@
#define SBSTDINC_H_NO_REDEFINE #define SBSTDINC_H_NO_REDEFINE
#endif #endif
#include <Dt/UserMsg.h>
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */ #include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
#include <assert.h> #include <assert.h>

13
cde/lib/DtSvc/DtEncap/connect.c
View file

@ -32,6 +32,8 @@
* (c) Copyright 1993, 1994 Novell, Inc. * * (c) Copyright 1993, 1994 Novell, Inc. *
*/ */
#include <Dt/UserMsg.h>
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */ #include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
#include <sys/socket.h> /**** needed by gethostbyname et al *****/ #include <sys/socket.h> /**** needed by gethostbyname et al *****/
@ -208,6 +210,7 @@ UnParseFileString(XeString host, XeString path)
/*------------------------------------------------------------------------+*/ /*------------------------------------------------------------------------+*/
int
XeParseFileString(XeString line, XeParseFileString(XeString line,
XeString *host_addr, XeString *host_addr,
XeString *path_addr) XeString *path_addr)
@ -261,7 +264,7 @@ GetDomainName(XeString buffer, unsigned int bufsize)
int status; int status;
/* try to get domain name from hostname */ /* try to get domain name from hostname */
if (status = gethostname(tmpbuf, bufsize)) { if ((status = gethostname(tmpbuf, bufsize))) {
XeFree(tmpbuf); XeFree(tmpbuf);
return status; /* failed gethostname */ return status; /* failed gethostname */
} }
@ -287,7 +290,7 @@ GetDomainName(XeString buffer, unsigned int bufsize)
_DtSvcProcessUnlock(); _DtSvcProcessUnlock();
return -1; return -1;
} }
if (ptr = strstr(host_ret->h_name, (XeString)".")) /* if dot in canonical name */ if ((ptr = strstr(host_ret->h_name, (XeString)"."))) /* if dot in canonical name */
domainname = strdup(ptr); domainname = strdup(ptr);
} }
@ -308,9 +311,9 @@ Xegetshorthostname(XeString buffer, unsigned int bufsize)
XeString ptr; XeString ptr;
int status; int status;
if (status = gethostname(buffer, bufsize)) if ((status = gethostname(buffer, bufsize)))
return status; /* failed gethostname */ return status; /* failed gethostname */
if (ptr = strstr(buffer, (XeString)".")) if ((ptr = strstr(buffer, (XeString)".")))
*ptr = '\0'; /* delete domain name if there is one */ *ptr = '\0'; /* delete domain name if there is one */
return 0; return 0;
} }
@ -385,7 +388,7 @@ Xegetcwd(char *buf, int size)
Boolean pwd_ok = FALSE; Boolean pwd_ok = FALSE;
char *env, *current_dir; char *env, *current_dir;
if (current_dir = getenv("PWD")) { /* use PWD instead of slow call */ if ((current_dir = getenv("PWD"))) { /* use PWD instead of slow call */
int s1, s2; int s1, s2;
struct stat sb1, sb2; struct stat sb1, sb2;

4
cde/lib/DtSvc/DtEncap/local.c
View file

@ -154,7 +154,7 @@ int local_channel_object_wait_for_termination(SPC_Channel_Ptr channel)
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
remove_logfile_local_channel_object(SPC_Channel_Ptr channel) int remove_logfile_local_channel_object(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
int result; int result;
@ -206,7 +206,7 @@ void local_channel_object_input_handler(void * client_data,
timeout.tv_sec = 0; timeout.tv_sec = 0;
timeout.tv_usec = 0; timeout.tv_usec = 0;
#if defined(SVR4) || defined(__osf__) || defined(__hpux) #if defined(SVR4) || defined(__osf__) || defined(__hpux) || defined(__OpenBSD__)
select(max_fds, (fd_set*)&read_fd_vect, NULL, (fd_set*)&except_fd_vect, &timeout); select(max_fds, (fd_set*)&read_fd_vect, NULL, (fd_set*)&except_fd_vect, &timeout);
#else #else
/* UX has select defined with int*, not fd_set* parms */ /* UX has select defined with int*, not fd_set* parms */

1
cde/lib/DtSvc/DtEncap/nls.c
View file

@ -35,6 +35,7 @@
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */ #include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
#include <bms/bms.h> #include <bms/bms.h>
#include <bms/MemoryMgr.h>
#ifndef CDE_LOGFILES_TOP #ifndef CDE_LOGFILES_TOP
#define CDE_LOGFILES_TOP "/var/dt/tmp" #define CDE_LOGFILES_TOP "/var/dt/tmp"

7
cde/lib/DtSvc/DtEncap/pty.c
View file

@ -260,7 +260,7 @@ static int getspec1170ptypair(Wire *wire)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
static getptypair(Wire *wire) static int getptypair(Wire *wire)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
/* Attempt to open the master/slave pair of preset pty */ /* Attempt to open the master/slave pair of preset pty */
@ -639,7 +639,7 @@ int read_pty_channel_object(SPC_Channel_Ptr channel,
result = read(fd, buffer, nbytes); result = read(fd, buffer, nbytes);
} while (result<0 && errno == EINTR); } while (result<0 && errno == EINTR);
if(result == ERROR) if(result == ERROR) {
if(errno == EIO) { if(errno == EIO) {
SPC_XtRemoveInput(&channel->wires[connector]->read_toolkit_id, SPC_Input); SPC_XtRemoveInput(&channel->wires[connector]->read_toolkit_id, SPC_Input);
SPC_Change_State(channel, connector, 0, -1); SPC_Change_State(channel, connector, 0, -1);
@ -652,6 +652,7 @@ int read_pty_channel_object(SPC_Channel_Ptr channel,
XeFree(connection_hostname); XeFree(connection_hostname);
return(SPC_ERROR); return(SPC_ERROR);
} }
}
return(result); return(result);
} }
@ -1031,7 +1032,7 @@ struct termios *SPC_Get_Current_Termio(void)
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
SPC_Setpgrp(int read_current_termio) int SPC_Setpgrp(int read_current_termio)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
_DtSvcProcessLock(); _DtSvcProcessLock();

4
cde/lib/DtSvc/DtEncap/remote.c
View file

@ -221,7 +221,7 @@ int reset_remote_channel_object(SPC_Channel_Ptr channel)
flush any queued data on this channel. */ flush any queued data on this channel. */
{ {
if (tmpqueue=channel->queued_remote_data) if ((tmpqueue=channel->queued_remote_data))
{ {
Xe_for_queue(protocol_request_ptr, prot, tmpqueue) { Xe_for_queue(protocol_request_ptr, prot, tmpqueue) {
Xe_delete_queue_element(channel->queued_remote_data, prot); Xe_delete_queue_element(channel->queued_remote_data, prot);
@ -402,6 +402,7 @@ int attach_remote_channel_object(SPC_Channel_Ptr channel,
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
remove_logfile_remote_channel_object(SPC_Channel_Ptr channel) remove_logfile_remote_channel_object(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -448,6 +449,7 @@ int add_input_remote_channel_object(SPC_Channel_Ptr channel,
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Debug_Mode(SPC_Channel_Ptr channel, SPC_Debug_Mode(SPC_Channel_Ptr channel,
XeString file) XeString file)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/

1
cde/lib/DtSvc/DtEncap/spc-env.c
View file

@ -32,6 +32,7 @@
* (c) Copyright 1993, 1994 Novell, Inc. * * (c) Copyright 1993, 1994 Novell, Inc. *
*/ */
#include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */ #include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */

10
cde/lib/DtSvc/DtEncap/spc-error.c
View file

@ -32,6 +32,8 @@
* (c) Copyright 1993, 1994 Novell, Inc. * * (c) Copyright 1993, 1994 Novell, Inc. *
*/ */
#include <Dt/UserMsg.h>
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */ #include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>
@ -55,7 +57,7 @@ XeChar spc_logfile[MAXPATHLEN+1];
XeChar spc_logging = FALSE; XeChar spc_logging = FALSE;
/* FILE *spc_logF = NULL; -- to bmsglob.c */ /* FILE *spc_logF = NULL; -- to bmsglob.c */
int spc_logfd = NULL; int spc_logfd = 0;
/* This is the SPC error number variable */ /* This is the SPC error number variable */
/* ------------------------------------- */ /* ------------------------------------- */
@ -243,6 +245,7 @@ void SPC_Error (int error, ...)
*/ */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Make_Log_Filename(XeString name, SPC_Make_Log_Filename(XeString name,
int unique) /* When TRUE, make name unique */ int unique) /* When TRUE, make name unique */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
@ -283,6 +286,7 @@ SPC_Make_Log_Filename(XeString name,
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Open_Log(XeString filename, SPC_Open_Log(XeString filename,
int unique) /* When TRUE, make filename unique */ int unique) /* When TRUE, make filename unique */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
@ -308,6 +312,7 @@ SPC_Open_Log(XeString filename,
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Close_Log(void) SPC_Close_Log(void)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -319,7 +324,7 @@ SPC_Close_Log(void)
if (spc_logF) { if (spc_logF) {
fclose(spc_logF); fclose(spc_logF);
} }
spc_logfd = NULL; spc_logfd = 0;
spc_logF = NULL; spc_logF = NULL;
spc_logging = FALSE; spc_logging = FALSE;
@ -328,6 +333,7 @@ SPC_Close_Log(void)
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Write_Log(XeString str) SPC_Write_Log(XeString str)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {

8
cde/lib/DtSvc/DtEncap/spc-exec.c
View file

@ -33,6 +33,7 @@
*/ */
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */ #include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
#include <ctype.h>
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include <sys/wait.h> #include <sys/wait.h>
@ -67,6 +68,9 @@ static int remove_variable(
static void resolve_variable_reference( static void resolve_variable_reference(
char **string ); char **string );
Boolean _path_search (
XeString path, XeString filename, path_search_predicate p); /* XXX */
/* /*
* This array contains the process id's of the sub-processes * This array contains the process id's of the sub-processes
* started by the daemon. When a sub-process terminates, its * started by the daemon. When a sub-process terminates, its
@ -105,6 +109,7 @@ extern XeString *environ;
*/ */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Setup_Synchronous_Terminator(void) SPC_Setup_Synchronous_Terminator(void)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -167,6 +172,7 @@ void SPC_Close_Unused(void)
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_MakeSystemCommand(SPC_Channel_Ptr channel) SPC_MakeSystemCommand(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -262,7 +268,7 @@ void SPC_Child_Terminated(int i)
prot->dataptr=pdata; prot->dataptr=pdata;
wait_pid = -1; wait_pid = -1;
while(pid = waitpid(wait_pid, &status, WNOHANG)) { while((pid = waitpid(wait_pid, &status, WNOHANG))) {
if((pid == -1 && errno == ECHILD) || pid == 0) { if((pid == -1 && errno == ECHILD) || pid == 0) {
/* no more children. Return */ /* no more children. Return */
errno = saved_errno; errno = saved_errno;

4
cde/lib/DtSvc/DtEncap/spc-net.c
View file

@ -172,6 +172,7 @@ Boolean SPC_Init_Local_Host_Info(void)
*/ */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Local_Hostname(XeString hostname) SPC_Local_Hostname(XeString hostname)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -287,6 +288,7 @@ SPC_Connection_Ptr SPC_Open_Connection(XeString hostname)
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Open_Socket(SPC_Connection_Ptr conn, SPC_Open_Socket(SPC_Connection_Ptr conn,
int type) int type)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
@ -319,6 +321,7 @@ SPC_Open_Socket(SPC_Connection_Ptr conn,
*/ */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Contact_Server(SPC_Connection_Ptr connection) SPC_Contact_Server(SPC_Connection_Ptr connection)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -481,6 +484,7 @@ SPC_Connection_Ptr SPC_Standalone_Daemon(SPC_Connection_Ptr conn)
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Inetd_Daemon(SPC_Connection_Ptr conn) SPC_Inetd_Daemon(SPC_Connection_Ptr conn)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {

10
cde/lib/DtSvc/DtEncap/spc-obj.c
View file

@ -120,6 +120,7 @@ static Wire dummy_wire={
}; };
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_ResetTerminator(void) SPC_ResetTerminator(void)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -142,6 +143,7 @@ SPC_ResetTerminator(void)
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Initialize(void) SPC_Initialize(void)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -265,6 +267,7 @@ void SPC_Channel_Terminated(SPC_Channel_Ptr channel)
*/ */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Check_Style(int iomode) SPC_Check_Style(int iomode)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -314,6 +317,7 @@ SPC_Check_Style(int iomode)
*/ */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Transform_Iomode(int iomode) SPC_Transform_Iomode(int iomode)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -342,6 +346,7 @@ SPC_Transform_Iomode(int iomode)
*/ */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Newline_Filter(SPC_Channel_Ptr channel, SPC_Newline_Filter(SPC_Channel_Ptr channel,
int connector, int connector,
XeString buffer, XeString buffer,
@ -399,6 +404,7 @@ SPC_Newline_Filter(SPC_Channel_Ptr channel,
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Input_Handler(SPC_Channel_Ptr channel, SPC_Input_Handler(SPC_Channel_Ptr channel,
int connector) int connector)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
@ -642,6 +648,7 @@ int exec_proc_channel_object (SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
signal_channel_object (SPC_Channel_Ptr UNUSED_PARM(channel), signal_channel_object (SPC_Channel_Ptr UNUSED_PARM(channel),
int UNUSED_PARM(sig)) int UNUSED_PARM(sig))
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
@ -659,6 +666,7 @@ int channel_object_wait_for_termination(SPC_Channel_Ptr UNUSED_PARM(channel))
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
attach_channel_object(SPC_Channel_Ptr UNUSED_PARM(channel), attach_channel_object(SPC_Channel_Ptr UNUSED_PARM(channel),
int UNUSED_PARM(pid)) int UNUSED_PARM(pid))
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
@ -668,6 +676,7 @@ attach_channel_object(SPC_Channel_Ptr UNUSED_PARM(channel),
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
add_input_channel_object(SPC_Channel_Ptr UNUSED_PARM(channel), add_input_channel_object(SPC_Channel_Ptr UNUSED_PARM(channel),
SbInputHandlerProc UNUSED_PARM(handler), SbInputHandlerProc UNUSED_PARM(handler),
void *UNUSED_PARM(data) ) void *UNUSED_PARM(data) )
@ -678,6 +687,7 @@ add_input_channel_object(SPC_Channel_Ptr UNUSED_PARM(channel),
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
remove_logfile_channel_object(SPC_Channel_Ptr channel) remove_logfile_channel_object(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {

4
cde/lib/DtSvc/DtEncap/spc-proto.c
View file

@ -586,8 +586,8 @@ void SPC_Flush_Queued_Data(SPC_Channel_Ptr channel)
XeQueue tmpqueue; XeQueue tmpqueue;
protocol_request_ptr prot; protocol_request_ptr prot;
if(tmpqueue=channel->queued_remote_data) { if((tmpqueue=channel->queued_remote_data)) {
while(prot=(protocol_request_ptr)Xe_pop_queue(tmpqueue)) while((prot=(protocol_request_ptr)Xe_pop_queue(tmpqueue)))
SPC_Free_Protocol_Ptr(prot); SPC_Free_Protocol_Ptr(prot);
} }

5
cde/lib/DtSvc/DtEncap/spc-sm.c
View file

@ -66,6 +66,7 @@ static int (* spc_state_table[16]) (SPC_Channel_Ptr channel, int connector)= {
}; };
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Change_State(SPC_Channel_Ptr channel, SPC_Change_State(SPC_Channel_Ptr channel,
int connector, int connector,
int data_line, int data_line,
@ -132,6 +133,7 @@ SPC_Change_State(SPC_Channel_Ptr channel,
error condition in the state table */ error condition in the state table */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
error_fun(SPC_Channel_Ptr UNUSED_PARM(channel), error_fun(SPC_Channel_Ptr UNUSED_PARM(channel),
int UNUSED_PARM(connector)) int UNUSED_PARM(connector))
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
@ -152,6 +154,7 @@ error_fun(SPC_Channel_Ptr UNUSED_PARM(channel),
*/ */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
connector_eof(SPC_Channel_Ptr channel, connector_eof(SPC_Channel_Ptr channel,
int connector) int connector)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
@ -196,6 +199,7 @@ connector_eof(SPC_Channel_Ptr channel,
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
connector_eof_with_reset(SPC_Channel_Ptr channel, connector_eof_with_reset(SPC_Channel_Ptr channel,
int connector) int connector)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
@ -216,6 +220,7 @@ connector_eof_with_reset(SPC_Channel_Ptr channel,
*/ */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
sigcld_with_reset(SPC_Channel_Ptr channel, sigcld_with_reset(SPC_Channel_Ptr channel,
int UNUSED_PARM(connector)) int UNUSED_PARM(connector))
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/

192
cde/lib/DtSvc/DtEncap/spc-termio.c
View file

@ -125,120 +125,120 @@ struct cc_s
#define END_OF_LIST "End_Of_List" #define END_OF_LIST "End_Of_List"
static struct modes_s Input_modes[] = { static struct modes_s Input_modes[] = {
"BRKINT", BRKINT, { "BRKINT", BRKINT, },
"ICRNL", ICRNL, { "ICRNL", ICRNL, },
"IGNBRK", IGNBRK, { "IGNBRK", IGNBRK, },
"IGNCR", IGNCR, { "IGNCR", IGNCR, },
"IGNPAR", IGNPAR, { "IGNPAR", IGNPAR, },
"INLCR", INLCR, { "INLCR", INLCR, },
"INPCK", INPCK, { "INPCK", INPCK, },
"ISTRIP", ISTRIP, { "ISTRIP", ISTRIP, },
"IXOFF", IXOFF, { "IXOFF", IXOFF, },
"IXON", IXON, { "IXON", IXON, },
"PARMRK", PARMRK, { "PARMRK", PARMRK, },
END_OF_LIST, 0 { END_OF_LIST, 0 },
}; };
static struct modes_s Output_modes[] = { static struct modes_s Output_modes[] = {
"OPOST", OPOST, { "OPOST", OPOST, },
"ONLCR", ONLCR, { "ONLCR", ONLCR, },
"OCRNL", OCRNL, { "OCRNL", OCRNL, },
"ONOCR", ONOCR, { "ONOCR", ONOCR, },
"ONLRET", ONLRET, { "ONLRET", ONLRET, },
#if !defined(CSRG_BASED) #if !defined(CSRG_BASED)
"OFILL", OFILL, { "OFILL", OFILL, },
"OFDEL", OFDEL, { "OFDEL", OFDEL, },
"NLDLY", NLDLY, { "NLDLY", NLDLY, },
"NL0", NL0, { "NL0", NL0, },
"NL1", NL1, { "NL1", NL1, },
"CRDLY", CRDLY, { "CRDLY", CRDLY, },
"CR0", CR0, { "CR0", CR0, },
"CR1", CR1, { "CR1", CR1, },
"CR2", CR2, { "CR2", CR2, },
"CR3", CR3, { "CR3", CR3, },
"TABDLY", TABDLY, { "TABDLY", TABDLY, },
"TAB0", TAB0, { "TAB0", TAB0, },
"TAB1", TAB1, { "TAB1", TAB1, },
"TAB2", TAB2, { "TAB2", TAB2, },
"TAB3", TAB3, { "TAB3", TAB3, },
"BSDLY", BSDLY, { "BSDLY", BSDLY, },
"BS0", BS0, { "BS0", BS0, },
"BS1", BS1, { "BS1", BS1, },
"VTDLY", VTDLY, { "VTDLY", VTDLY, },
"VT0", VT0, { "VT0", VT0, },
"VT1", VT1, { "VT1", VT1, },
"FFDLY", FFDLY, { "FFDLY", FFDLY, },
"FF0", FF0, { "FF0", FF0, },
"FF1", FF1, { "FF1", FF1, },
#endif #endif
END_OF_LIST, 0 { END_OF_LIST, 0 },
}; };
static struct baud_s Baud_rates[] = { static struct baud_s Baud_rates[] = {
"B0", B0, { "B0", B0, },
"B50", B50, { "B50", B50, },
"B75", B75, { "B75", B75, },
"B110", B110, { "B110", B110, },
"B134", B134, { "B134", B134, },
"B150", B150, { "B150", B150, },
"B200", B200, { "B200", B200, },
"B300", B300, { "B300", B300, },
"B600", B600, { "B600", B600, },
"B1200", B1200, { "B1200", B1200, },
"B1800", B1800, { "B1800", B1800, },
"B2400", B2400, { "B2400", B2400, },
"B4800", B4800, { "B4800", B4800, },
"B9600", B9600, { "B9600", B9600, },
"B19200", B19200, { "B19200", B19200, },
"B38400", B38400, { "B38400", B38400, },
END_OF_LIST, 0 { END_OF_LIST, 0 },
}; };
static struct modes_s Control_modes[] = { static struct modes_s Control_modes[] = {
"CSIZE", CSIZE, { "CSIZE", CSIZE, },
"CS5", CS5, { "CS5", CS5, },
"CS6", CS6, { "CS6", CS6, },
"CS7", CS7, { "CS7", CS7, },
"CS8", CS8, { "CS8", CS8, },
"CSTOPB", CSTOPB, { "CSTOPB", CSTOPB, },
"CREAD", CREAD, { "CREAD", CREAD, },
"PARENB", PARENB, { "PARENB", PARENB, },
"PARODD", PARODD, { "PARODD", PARODD, },
"HUPCL", HUPCL, { "HUPCL", HUPCL, },
"CLOCAL", CLOCAL, { "CLOCAL", CLOCAL, },
END_OF_LIST, 0 { END_OF_LIST, 0 },
}; };
static struct modes_s Local_modes[] = { static struct modes_s Local_modes[] = {
"ECHO", ECHO, { "ECHO", ECHO, },
"ECHOE", ECHOE, { "ECHOE", ECHOE, },
"ECHOK", ECHOK, { "ECHOK", ECHOK, },
"ECHONL", ECHONL, { "ECHONL", ECHONL, },
"ICANON", ICANON, { "ICANON", ICANON, },
"IEXTEN", IEXTEN, { "IEXTEN", IEXTEN, },
"ISIG", ISIG, { "ISIG", ISIG, },
"NOFLSH", NOFLSH, { "NOFLSH", NOFLSH, },
"TOSTOP", TOSTOP, { "TOSTOP", TOSTOP, },
END_OF_LIST, 0 { END_OF_LIST, 0 },
}; };
static struct cc_s CC_Array[] = { static struct cc_s CC_Array[] = {
"VEOF", VEOF, { "VEOF", VEOF, },
"VEOL", VEOL, { "VEOL", VEOL, },
"VERASE", VERASE, { "VERASE", VERASE, },
"VINTR", VINTR, { "VINTR", VINTR, },
"VKILL", VKILL, { "VKILL", VKILL, },
"VMIN", VMIN, { "VMIN", VMIN, },
"VQUIT", VQUIT, { "VQUIT", VQUIT, },
"VSTART", VSTART, { "VSTART", VSTART, },
"VSTOP", VSTOP, { "VSTOP", VSTOP, },
"VSUSP", VSUSP, { "VSUSP", VSUSP, },
"VTIME", VTIME, { "VTIME", VTIME, },
END_OF_LIST, 0 { END_OF_LIST, 0 },
}; };
@ -291,7 +291,7 @@ static tcflag_t
if (!*buff) if (!*buff)
return flag; return flag;
while (item = (XeString)STRTOKX(buff, SPC_TCFLAG_SEP)) while ((item = (XeString)STRTOKX(buff, SPC_TCFLAG_SEP)))
{ {
Boolean found = FALSE; Boolean found = FALSE;
@ -433,7 +433,7 @@ static void
if (!*buff) return; if (!*buff) return;
while (cc_name = (XeString)STRTOKX(buff, SPC_TCFLAG_SEP)) while ((cc_name = (XeString)STRTOKX(buff, SPC_TCFLAG_SEP)))
{ {
Boolean found = FALSE; Boolean found = FALSE;
@ -533,7 +533,7 @@ void SPC_Encode_Termios(XeString buff, struct termios *tio)
int item_cnt = 0; int item_cnt = 0;
speed_t speed; speed_t speed;
while (item = (XeString)STRTOKX(buff, SPC_TERMIO_SEP)) while ((item = (XeString)STRTOKX(buff, SPC_TERMIO_SEP)))
{ {
/* We can possibly have an all blank field. Walk past them */ /* We can possibly have an all blank field. Walk past them */
/* because the routines we will be calling don't expect any */ /* because the routines we will be calling don't expect any */

3
cde/lib/DtSvc/DtEncap/spc-util.c
View file

@ -96,6 +96,7 @@ SPC_Channel_Ptr SPC_Find_PID(int pid)
*/ */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
spc_close(int fd) spc_close(int fd)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -108,6 +109,7 @@ spc_close(int fd)
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
spc_dup2(int from, int to) spc_dup2(int from, int to)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -134,6 +136,7 @@ spc_dup2(int from, int to)
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_fd_to_connector(SPC_Channel_Ptr channel, SPC_fd_to_connector(SPC_Channel_Ptr channel,
int fd) int fd)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/

3
cde/lib/DtSvc/DtEncap/spc-xt.c
View file

@ -133,7 +133,8 @@ static SbInputId SPC_RemoveInput(int source,
} }
/*-----------------------------------------------------------------------+*/ /*-----------------------------------------------------------------------+*/
static SPC_Select(void ) static int
SPC_Select(void )
/*-----------------------------------------------------------------------+*/ /*-----------------------------------------------------------------------+*/
{ {
break_on_termination=TRUE; break_on_termination=TRUE;

22
cde/lib/DtSvc/DtEncap/spc.c
View file

@ -118,6 +118,7 @@ SPC_Channel_Ptr XeSPCOpen(XeString hostname,
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCClose(SPC_Channel_Ptr channel) XeSPCClose(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -141,6 +142,7 @@ XeSPCClose(SPC_Channel_Ptr channel)
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCReset(SPC_Channel_Ptr channel) XeSPCReset(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -163,6 +165,7 @@ XeSPCReset(SPC_Channel_Ptr channel)
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCRead(SPC_Channel_Ptr channel, XeSPCRead(SPC_Channel_Ptr channel,
int connector, /* STDOUT or STDERR */ int connector, /* STDOUT or STDERR */
XeString buffer, XeString buffer,
@ -201,6 +204,7 @@ XeSPCRead(SPC_Channel_Ptr channel,
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCWrite(SPC_Channel_Ptr channel, XeSPCWrite(SPC_Channel_Ptr channel,
XeString buffer, XeString buffer,
int length) int length)
@ -230,6 +234,7 @@ XeSPCWrite(SPC_Channel_Ptr channel,
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCActive(SPC_Channel_Ptr channel) XeSPCActive(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -244,6 +249,7 @@ XeSPCActive(SPC_Channel_Ptr channel)
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCData(SPC_Channel_Ptr channel) XeSPCData(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -258,6 +264,7 @@ XeSPCData(SPC_Channel_Ptr channel)
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCExecuteProcess(SPC_Channel_Ptr channel) XeSPCExecuteProcess(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -286,6 +293,7 @@ XeSPCExecuteProcess(SPC_Channel_Ptr channel)
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCSignalProcess(SPC_Channel_Ptr channel, XeSPCSignalProcess(SPC_Channel_Ptr channel,
int sig) int sig)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
@ -308,6 +316,7 @@ XeSPCSignalProcess(SPC_Channel_Ptr channel,
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCAddInput(SPC_Channel_Ptr channel, XeSPCAddInput(SPC_Channel_Ptr channel,
SbInputHandlerProc handler, SbInputHandlerProc handler,
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
@ -332,6 +341,7 @@ XeSPCAddInput(SPC_Channel_Ptr channel,
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCRegisterTerminator(SPC_Channel_Ptr channel, XeSPCRegisterTerminator(SPC_Channel_Ptr channel,
SPC_TerminateHandlerType terminator, SPC_TerminateHandlerType terminator,
void * client_data) void * client_data)
@ -371,6 +381,7 @@ XeSPCRegisterTerminator(SPC_Channel_Ptr channel,
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCAttach(SPC_Channel_Ptr channel, XeSPCAttach(SPC_Channel_Ptr channel,
int pid) int pid)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
@ -385,6 +396,7 @@ XeSPCAttach(SPC_Channel_Ptr channel,
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCDetach(SPC_Channel_Ptr channel) XeSPCDetach(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -417,6 +429,7 @@ XeSPCDetach(SPC_Channel_Ptr channel)
*/ */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCSpawn(XeString pathname, XeSPCSpawn(XeString pathname,
XeString context_dir, XeString context_dir,
XeString *argv, XeString *argv,
@ -505,6 +518,7 @@ XeSPCKillProcesses(int wait)
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCKillProcess(SPC_Channel_Ptr channel, XeSPCKillProcess(SPC_Channel_Ptr channel,
int wait) int wait)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
@ -527,6 +541,7 @@ XeSPCKillProcess(SPC_Channel_Ptr channel,
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCInterruptProcess(SPC_Channel_Ptr channel) XeSPCInterruptProcess(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -567,6 +582,7 @@ XeString XeSPCGetDevice(SPC_Channel_Ptr channel,
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCGetProcessStatus(SPC_Channel_Ptr channel, XeSPCGetProcessStatus(SPC_Channel_Ptr channel,
int *type, int *type,
int *cause) int *cause)
@ -609,6 +625,7 @@ XeSPCGetProcessStatus(SPC_Channel_Ptr channel,
} }
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCGetPID(SPC_Channel_Ptr channel) XeSPCGetPID(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -677,6 +694,7 @@ int XeSPCRemoveLogfile(SPC_Channel_Ptr channel)
*/ */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
SPC_Process_Single_Prot_Request(protocol_request_ptr req, SPC_Channel_Ptr channel) SPC_Process_Single_Prot_Request(protocol_request_ptr req, SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -724,7 +742,7 @@ SPC_Channel_Ptr XeSPCHandleTerminator(int fd)
connection_queue=connection->queued_remote_data; connection_queue=connection->queued_remote_data;
Xe_push_queue(connection_queue, prot); Xe_push_queue(connection_queue, prot);
while(prot=(protocol_request_ptr)Xe_pop_queue(connection_queue)) { while((prot=(protocol_request_ptr)Xe_pop_queue(connection_queue))) {
channel=prot->channel; channel=prot->channel;
@ -755,6 +773,7 @@ SPC_Channel_Ptr XeSPCHandleTerminator(int fd)
*/ */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSPCGetChannelSyncFd(SPC_Channel_Ptr channel) XeSPCGetChannelSyncFd(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {
@ -852,6 +871,7 @@ void XeSPCRestartCallbacks(void)
*/ */
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
int
XeSetpgrp(int read_current_termio) XeSetpgrp(int read_current_termio)
/*----------------------------------------------------------------------+*/ /*----------------------------------------------------------------------+*/
{ {

4
cde/lib/DtSvc/DtEncap/stringbuf.c
View file

@ -116,7 +116,7 @@ XeAppendToStringBuffer(XeStringBuffer buffer, XeString string)
buffer->last_char = i - 1; buffer->last_char = i - 1;
if (-1 == ExpandStringBuffer(buffer)) return(-1); if (-1 == ExpandStringBuffer(buffer)) return(-1);
} }
buffer->buffer[i] = (XeChar) NULL; buffer->buffer[i] = (XeChar)'\0';
buffer->last_char = i; buffer->last_char = i;
# if DEBUG >= 5 # if DEBUG >= 5
sprintf(debug_string, "new string is: \"%s\"", buffer->buffer); sprintf(debug_string, "new string is: \"%s\"", buffer->buffer);
@ -131,7 +131,7 @@ XeClearStringBuffer(XeStringBuffer buffer)
/*------------------------------------------------------------------------+*/ /*------------------------------------------------------------------------+*/
{ {
XeString string = buffer->buffer; XeString string = buffer->buffer;
string[0] = (XeChar) NULL; string[0] = (XeChar)'\0';
buffer->last_char = 0; buffer->last_char = 0;
} }

3
cde/lib/DtSvc/DtUtil1/Action.c
View file

@ -63,6 +63,7 @@
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include <Dt/CmdInv.h>
#include <Dt/DtP.h> #include <Dt/DtP.h>
#include <Dt/Dts.h> #include <Dt/Dts.h>
#include <Dt/Help.h> #include <Dt/Help.h>
@ -5138,7 +5139,7 @@ CmdInvSuccessfulRequest(
* its status via TT messaging OR it may already have exited. * its status via TT messaging OR it may already have exited.
* For now we set the state here -- till we find a better place. * For now we set the state here -- till we find a better place.
*/ */
if (childrecp = _DtActFindChildRec(invp->id,data->requestPtr->childId)) if ((childrecp = _DtActFindChildRec(invp->id,data->requestPtr->childId)))
childrecp->childState = _DtActCHILD_ALIVE_UNKNOWN; childrecp->childState = _DtActCHILD_ALIVE_UNKNOWN;
else else
myassert(0 /* could not find child record */ ); myassert(0 /* could not find child record */ );

59
cde/lib/DtSvc/DtUtil1/ActionDb.c
View file

@ -42,6 +42,7 @@
/*LINTLIBRARY*/ /*LINTLIBRARY*/
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <ctype.h>
#include <string.h> #include <string.h>
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
@ -176,41 +177,41 @@ typedef struct {
* along with the bitmask that represents the field. * along with the bitmask that represents the field.
*/ */
static _DtActNameAndBit _DtActNamesAndBits[] = { static _DtActNameAndBit _DtActNamesAndBits[] = {
_DtACTION_LABEL, _ActDb_LABEL_SET, { _DtACTION_LABEL, _ActDb_LABEL_SET, },
_DtACTION_TYPE, _ActDb_TYPE_SET, { _DtACTION_TYPE, _ActDb_TYPE_SET, },
_DtACTION_ARG_CLASS, _ActDb_ARG_CLASS_SET, { _DtACTION_ARG_CLASS, _ActDb_ARG_CLASS_SET, },
_DtACTION_ARG_MODE, _ActDb_ARG_MODE_SET, { _DtACTION_ARG_MODE, _ActDb_ARG_MODE_SET, },
_DtACTION_ARG_TYPE, _ActDb_ARG_TYPE_SET, { _DtACTION_ARG_TYPE, _ActDb_ARG_TYPE_SET, },
_DtACTION_ARG_COUNT, _ActDb_ARG_COUNT_SET, { _DtACTION_ARG_COUNT, _ActDb_ARG_COUNT_SET, },
_DtACTION_DESCRIPTION, _ActDb_DESCRIPTION_SET, { _DtACTION_DESCRIPTION, _ActDb_DESCRIPTION_SET, },
_DtACTION_ICON, _ActDb_ICON_SET, { _DtACTION_ICON, _ActDb_ICON_SET, },
/******************************************************************* /*******************************************************************
Meaningless for actions -- ignore these for now Meaningless for actions -- ignore these for now
_DtACTION_INSTANCE_ICON, _ActDb_INSTANCE_ICON_SET, { _DtACTION_INSTANCE_ICON, _ActDb_INSTANCE_ICON_SET, },
*******************************************************************/ *******************************************************************/
_DtACTION_MAP_ACTION, _ActDb_MAP_ACTION_SET, { _DtACTION_MAP_ACTION, _ActDb_MAP_ACTION_SET, },
_DtACTION_EXEC_STRING, _ActDb_EXEC_STRING_SET, { _DtACTION_EXEC_STRING, _ActDb_EXEC_STRING_SET, },
_DtACTION_EXEC_HOST, _ActDb_EXEC_HOST_SET, { _DtACTION_EXEC_HOST, _ActDb_EXEC_HOST_SET, },
_DtACTION_CWD, _ActDb_CWD_SET, { _DtACTION_CWD, _ActDb_CWD_SET, },
_DtACTION_WINDOW_TYPE, _ActDb_WINDOW_TYPE_SET, { _DtACTION_WINDOW_TYPE, _ActDb_WINDOW_TYPE_SET, },
_DtACTION_TERM_OPTS, _ActDb_TERM_OPTS_SET, { _DtACTION_TERM_OPTS, _ActDb_TERM_OPTS_SET, },
_DtACTION_TT_CLASS, _ActDb_TT_CLASS_SET, { _DtACTION_TT_CLASS, _ActDb_TT_CLASS_SET, },
_DtACTION_TT_SCOPE, _ActDb_TT_SCOPE_SET, { _DtACTION_TT_SCOPE, _ActDb_TT_SCOPE_SET, },
_DtACTION_TT_OPERATION, _ActDb_TT_OPERATION_SET, { _DtACTION_TT_OPERATION, _ActDb_TT_OPERATION_SET, },
_DtACTION_TT_FILE, _ActDb_TT_FILE_SET, { _DtACTION_TT_FILE, _ActDb_TT_FILE_SET, },
_DtACTION_TTN_MODE, _ActDb_TT_ARGN_MODE_SET, { _DtACTION_TTN_MODE, _ActDb_TT_ARGN_MODE_SET, },
_DtACTION_TTN_VTYPE, _ActDb_TT_ARGN_VTYP_SET, { _DtACTION_TTN_VTYPE, _ActDb_TT_ARGN_VTYP_SET, },
_DtACTION_TTN_REP_TYPE, _ActDb_TT_ARGN_RTYP_SET, { _DtACTION_TTN_REP_TYPE, _ActDb_TT_ARGN_RTYP_SET, },
_DtACTION_TTN_VALUE, _ActDb_TT_ARGN_VAL_SET, { _DtACTION_TTN_VALUE, _ActDb_TT_ARGN_VAL_SET, },
#ifdef _DT_ALLOW_DT_MSGS #ifdef _DT_ALLOW_DT_MSGS
_DtACTION_DT_REQUEST_NAME, _ActDb_DT_REQ_NAME_SET, { _DtACTION_DT_REQUEST_NAME, _ActDb_DT_REQ_NAME_SET, },
_DtACTION_DT_SVC, _ActDb_DT_SVC_SET, { _DtACTION_DT_SVC, _ActDb_DT_SVC_SET, },
_DtACTION_DT_NOTIFY_NAME, _ActDb_DT_NTFY_NAME_SET, { _DtACTION_DT_NOTIFY_NAME, _ActDb_DT_NTFY_NAME_SET, },
_DtACTION_DT_NGROUP, _ActDb_DT_NGROUP_SET, { _DtACTION_DT_NGROUP, _ActDb_DT_NGROUP_SET, },
_DtPFX _DtACTION_DTN_VALUE, _ActDb_DT_ARGN_VAL_SET, { _DtPFX _DtACTION_DTN_VALUE, _ActDb_DT_ARGN_VAL_SET, },
#endif /* _DT_ALLOW_DT_MSGS */ #endif /* _DT_ALLOW_DT_MSGS */
NULL, 0 { NULL, 0 },
}; };
#define NUM_FIELD_NAMES sizeof(_DtActNamesAndBits)/sizeof(_DtActNameAndBit) - 1 #define NUM_FIELD_NAMES sizeof(_DtActNamesAndBits)/sizeof(_DtActNameAndBit) - 1

18
cde/lib/DtSvc/DtUtil1/ActionFind.c
View file

@ -1939,14 +1939,14 @@ ValidKeyword(
* Fill in the length of the keywords at compile time by * Fill in the length of the keywords at compile time by
* using the "sizeof" operator (and subtracting one for the NULL). * using the "sizeof" operator (and subtracting one for the NULL).
*/ */
static localHostLen = sizeof(_DtACT_LOCALHOST_STR) - 1; static int localHostLen = sizeof(_DtACT_LOCALHOST_STR) - 1;
static databaseHostLen = sizeof(_DtACT_DATABASEHOST_STR) - 1; static int databaseHostLen = sizeof(_DtACT_DATABASEHOST_STR) - 1;
static displayHostLen = sizeof(_DtACT_DISPLAYHOST_STR) - 1; static int displayHostLen = sizeof(_DtACT_DISPLAYHOST_STR) - 1;
static sessionHostLen = sizeof(_DtACT_SESSIONHOST_STR) - 1; static int sessionHostLen = sizeof(_DtACT_SESSIONHOST_STR) - 1;
static argsLen = sizeof(_DtACT_ARGS_STR) - 1; static int argsLen = sizeof(_DtACT_ARGS_STR) - 1;
static arg_Len = sizeof(_DtACT_ARG_UNDER_STR) - 1; static int arg_Len = sizeof(_DtACT_ARG_UNDER_STR) - 1;
static stringQualifierLen = sizeof(_DtACT_STRING_QUALIFIER) - 1; static int stringQualifierLen = sizeof(_DtACT_STRING_QUALIFIER) - 1;
static fileQualifierLen = sizeof(_DtACT_FILE_QUALIFIER) - 1; static int fileQualifierLen = sizeof(_DtACT_FILE_QUALIFIER) - 1;
int len = end - start + 1; int len = end - start + 1;
char *stop; char *stop;
char *lastCh; char *lastCh;
@ -2303,7 +2303,7 @@ ParseMessage(
while (1) while (1)
{ {
/* Look for the start and end of a keyword */ /* Look for the start and end of a keyword */
if (keywordStart = DtStrchr(start, '%')) if ((keywordStart = DtStrchr(start, '%')))
keywordEnd = DtStrchr(keywordStart+1, '%'); keywordEnd = DtStrchr(keywordStart+1, '%');
else else
keywordEnd = NULL; keywordEnd = NULL;

1
cde/lib/DtSvc/DtUtil1/ActionTt.c
View file

@ -82,6 +82,7 @@
#include <Dt/DtNlUtils.h> #include <Dt/DtNlUtils.h>
#include <Dt/CommandM.h> #include <Dt/CommandM.h>
#include <Dt/Utility.h> #include <Dt/Utility.h>
#include <Dt/SvcTT.h>
#include <Dt/Service.h> #include <Dt/Service.h>
#include <Dt/ActionUtilP.h> #include <Dt/ActionUtilP.h>

9
cde/lib/DtSvc/DtUtil1/ActionUtil.c
View file

@ -38,6 +38,7 @@
************************************<+>*************************************/ ************************************<+>*************************************/
/*LINTLIBRARY*/ /*LINTLIBRARY*/
#include <ctype.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
@ -66,6 +67,7 @@
#include <Dt/ActionUtilP.h> #include <Dt/ActionUtilP.h>
#include <Dt/CmdInvP.h> #include <Dt/CmdInvP.h>
#include <Dt/DtNlUtils.h> #include <Dt/DtNlUtils.h>
#include <Dt/Indicator.h>
#include "myassertP.h" #include "myassertP.h"
#include "DtSvcLock.h" #include "DtSvcLock.h"
@ -354,7 +356,7 @@ _DtGetDisplayHostName( Display *dp)
*/ */
strcpy(tmpName,DisplayString(dp)); strcpy(tmpName,DisplayString(dp));
if ( tmp = DtStrrchr(tmpName,':') ) if (( tmp = DtStrrchr(tmpName,':') ))
{ {
*tmp = '\0'; *tmp = '\0';
displayHostName = XtNewString(tmpName); displayHostName = XtNewString(tmpName);
@ -368,7 +370,7 @@ _DtGetDisplayHostName( Display *dp)
* DISPLAY environment variable. * DISPLAY environment variable.
*/ */
strcpy(tmpName,getenv("DISPLAY")); strcpy(tmpName,getenv("DISPLAY"));
if ( tmp = DtStrrchr(tmpName,':') ) if (( tmp = DtStrrchr(tmpName,':') ))
{ {
*tmp = '\0'; *tmp = '\0';
displayHostName = XtNewString(tmpName); displayHostName = XtNewString(tmpName);
@ -423,7 +425,7 @@ _DtGetLocalHostName( void )
_DtSvcProcessUnlock(); _DtSvcProcessUnlock();
return NULL; /* failed gethostname */ return NULL; /* failed gethostname */
} }
if (ptr = DtStrchr(hostNameBuf, '.')) if ((ptr = DtStrchr(hostNameBuf, '.')))
*ptr = '\0'; /* delete domain name if there is one */ *ptr = '\0'; /* delete domain name if there is one */
localHostName = hostNameBuf; localHostName = hostNameBuf;
@ -1872,6 +1874,7 @@ _DtActReadTmpFileToBuffer( char *fname, int *sizep )
* *
*****************************************************************************/ *****************************************************************************/
int
_DtActGetCmdReturnArgs( _DtActGetCmdReturnArgs(
DtActionInvocationID invId, DtActionInvocationID invId,
_DtActChildRecT *childp, _DtActChildRecT *childp,

1
cde/lib/DtSvc/DtUtil1/CmdMain.c
View file

@ -58,6 +58,7 @@
#include <Dt/CommandM.h> #include <Dt/CommandM.h>
#include <Dt/EnvControlP.h> #include <Dt/EnvControlP.h>
#include <Dt/DtNlUtils.h> #include <Dt/DtNlUtils.h>
#include <Dt/Utility.h>
#include <Dt/ActionDb.h> #include <Dt/ActionDb.h>
#include <Dt/ActionUtilP.h> #include <Dt/ActionUtilP.h>

2
cde/lib/DtSvc/DtUtil1/DbReader.c
View file

@ -189,7 +189,7 @@ _DtDbPathIdToString(
char * path; char * path;
char * newPath; char * newPath;
if (path = XrmQuarkToString((XrmQuark)pathId)) if ((path = XrmQuarkToString((XrmQuark)pathId)))
{ {
/* Allocate some storage for the string */ /* Allocate some storage for the string */
newPath = (char *) XtNewString(path); newPath = (char *) XtNewString(path);

2
cde/lib/DtSvc/DtUtil1/DbUtil.c
View file

@ -742,7 +742,7 @@ _DtDbGetDataBaseEnv( void )
* Get the DTDATABASESEARCHPATH environment variable. If it is not set, * Get the DTDATABASESEARCHPATH environment variable. If it is not set,
* create the default value. * create the default value.
*/ */
if ( temp_s = getenv ("DTDATABASESEARCHPATH")) if (( temp_s = getenv ("DTDATABASESEARCHPATH")))
if ( *temp_s != 0 ) return XtNewString(temp_s); if ( *temp_s != 0 ) return XtNewString(temp_s);
temp_buf = temp_buf =

6
cde/lib/DtSvc/DtUtil2/ChkpntClient.c
View file

@ -97,7 +97,8 @@ static Bool myCheckClientEvent(Display *display, XEvent *event, char *args)
/* /*
* myDtChkpntMsgSend --- Helper function: Send a checkpoint message to the listener * myDtChkpntMsgSend --- Helper function: Send a checkpoint message to the listener
*/ */
static myDtChkpntMsgSend(char *message, char *type) static int
myDtChkpntMsgSend(char *message, char *type)
{ {
static long msgcount = 0; /* Running count of messages */ static long msgcount = 0; /* Running count of messages */
static int propnum = 0; /* Which property are we using ? */ static int propnum = 0; /* Which property are we using ? */
@ -210,6 +211,7 @@ static myDtChkpntMsgSend(char *message, char *type)
/* /*
* _DtPerfChkpntInit --- Initialize the checkpointing mechanism * _DtPerfChkpntInit --- Initialize the checkpointing mechanism
*/ */
int
_DtPerfChkpntInit(Display *display, _DtPerfChkpntInit(Display *display,
Window parentwin, Window parentwin,
char *prog_name, char *prog_name,
@ -300,6 +302,7 @@ _DtPerfChkpntInit(Display *display,
/* /*
* _DtPerfChkpntMsgSend --- Send a checkpoint message to the listener * _DtPerfChkpntMsgSend --- Send a checkpoint message to the listener
*/ */
void
_DtPerfChkpntMsgSend(char *message) _DtPerfChkpntMsgSend(char *message)
{ {
myDtChkpntMsgSend(message, DT_PERF_CHKPNT_MSG_CHKPNT); myDtChkpntMsgSend(message, DT_PERF_CHKPNT_MSG_CHKPNT);
@ -308,6 +311,7 @@ _DtPerfChkpntMsgSend(char *message)
/* /*
* myDtPerfChkpntEnd --- End the checkpointing message delivery * myDtPerfChkpntEnd --- End the checkpointing message delivery
*/ */
int
_DtPerfChkpntEnd() _DtPerfChkpntEnd()
{ {
myDtChkpntMsgSend("End checkpoint delivery", DT_PERF_CHKPNT_MSG_END); myDtChkpntMsgSend("End checkpoint delivery", DT_PERF_CHKPNT_MSG_END);

1
cde/lib/DtSvc/DtUtil2/ChkpntListen.c
View file

@ -57,6 +57,7 @@ static struct {
} dtsvc_info; } dtsvc_info;
/* _DtPerfChkpntListenInit(): Start the Checkpoint listener */ /* _DtPerfChkpntListenInit(): Start the Checkpoint listener */
int
#ifdef _NOPROTO #ifdef _NOPROTO
_DtPerfChkpntListenInit(display, parentwin) _DtPerfChkpntListenInit(display, parentwin)
Display *display; /* Current display */ Display *display; /* Current display */

8
cde/lib/DtSvc/DtUtil2/ChkpntP.h
View file

@ -97,7 +97,7 @@ typedef union {
*/ */
/* Initialize the checkpointing mechanism */ /* Initialize the checkpointing mechanism */
extern _DtPerfChkpntInit( extern int _DtPerfChkpntInit(
Display *display, /* Display pointer */ Display *display, /* Display pointer */
Window parentwin, /* Parent window id */ Window parentwin, /* Parent window id */
char *prog_name, /* Name of the client program (argv[0]) */ char *prog_name, /* Name of the client program (argv[0]) */
@ -105,12 +105,12 @@ extern _DtPerfChkpntInit(
); );
/* Send a checkpoint message to the listener */ /* Send a checkpoint message to the listener */
extern _DtPerfChkpntMsgSend( extern void _DtPerfChkpntMsgSend(
char *message /* Acual message for transmission */ char *message /* Acual message for transmission */
); );
/* End the checkpointing message delivery */ /* End the checkpointing message delivery */
extern _DtPerfChkpntEnd( extern int _DtPerfChkpntEnd(
); );
/*************************************************************************/ /*************************************************************************/
@ -118,7 +118,7 @@ extern _DtPerfChkpntEnd(
/*************************************************************************/ /*************************************************************************/
/* Initialize the listener */ /* Initialize the listener */
extern _DtPerfChkpntListenInit( extern int _DtPerfChkpntListenInit(
Display *display, /* Current display */ Display *display, /* Current display */
Window parentwin /* Parent of window associated with listener */ Window parentwin /* Parent of window associated with listener */
); );

1
cde/lib/DtSvc/DtUtil2/CmdUtility.c
View file

@ -32,6 +32,7 @@
* (c) Copyright 1993, 1994 Novell, Inc. * * (c) Copyright 1993, 1994 Novell, Inc. *
*/ */
#include <ctype.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/param.h> #include <sys/param.h>

8
cde/lib/DtSvc/DtUtil2/DtEnvMap.c
View file

@ -1001,7 +1001,7 @@ static void _DtEnvMapIt(
/* /*
* Tear apart and check for so called substitution characters. * Tear apart and check for so called substitution characters.
*/ */
if ( tmpPtr = DtStrchr(prePend, '%') ) { if (( tmpPtr = DtStrchr(prePend, '%') )) {
/* /*
* Temporarly shorten path up to substitution character. * Temporarly shorten path up to substitution character.
*/ */
@ -1341,7 +1341,7 @@ void _DtEnvMapForRemote (char *targetHost)
*/ */
cacheRegen = 0; cacheRegen = 0;
for ( i = 0; i < targetCache->mapListCnt; i++ ) { for ( i = 0; i < targetCache->mapListCnt; i++ ) {
if ( tmpPtr = getenv(targetCache->mapList[i]) ) { if (( tmpPtr = getenv(targetCache->mapList[i]) )) {
if ( strcmp( tmpPtr, if ( strcmp( tmpPtr,
targetCache->mapListDetails[i].localEnvVarCopy) ) { targetCache->mapListDetails[i].localEnvVarCopy) ) {
cacheRegen = 1; /* one map entry is no longer valid */ cacheRegen = 1; /* one map entry is no longer valid */
@ -1402,8 +1402,8 @@ void _DtEnvMapForRemote (char *targetHost)
* the restoration pointers. * the restoration pointers.
*/ */
for ( i = 0; i < targetCache->mapListCnt; i++ ) { for ( i = 0; i < targetCache->mapListCnt; i++ ) {
if ( targetCache->mapListDetails[i].localEnvVarPtr = if (( targetCache->mapListDetails[i].localEnvVarPtr =
getenv( targetCache->mapList[i] ) ) { getenv( targetCache->mapList[i] ) )) {
targetCache->mapListDetails[i].localEnvVarPtr -= targetCache->mapListDetails[i].localEnvVarPtr -=
strlen( targetCache->mapList[i] ) + 1; strlen( targetCache->mapList[i] ) + 1;
} }

1
cde/lib/DtSvc/DtUtil2/DtNlUtils.c
View file

@ -35,6 +35,7 @@
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
#include <ctype.h>
#include <string.h> #include <string.h>
#include <Dt/DtNlUtils.h> #include <Dt/DtNlUtils.h>
#include "DtSvcLock.h" #include "DtSvcLock.h"

8
cde/lib/DtSvc/DtUtil2/EnvControl.c
View file

@ -423,13 +423,13 @@ _DtEnvControl(
_postDtEnvironment.binPath = XtMalloc(bytes_needed); _postDtEnvironment.binPath = XtMalloc(bytes_needed);
#ifdef sun #ifdef sun
if (ptr = strstr(tempString, "/usr/openwin/bin")) if ((ptr = strstr(tempString, "/usr/openwin/bin")))
#elif defined(CSRG_BASED) #elif defined(CSRG_BASED)
if (ptr = strstr(tempString, "/usr/X11R6/bin")) if ((ptr = strstr(tempString, "/usr/X11R6/bin")))
#elif defined(linux) #elif defined(linux)
if (ptr = strstr(tempString, "/usr/bin")) if ((ptr = strstr(tempString, "/usr/bin")))
#else #else
if (ptr = strstr(tempString, "/usr/bin/X11")) if ((ptr = strstr(tempString, "/usr/bin/X11")))
#endif #endif
{ {
/* /*

4
cde/lib/DtSvc/DtUtil2/Hash.c
View file

@ -119,7 +119,7 @@ GetTableIndex(
if (tab->keyIsString) { if (tab->keyIsString) {
s1 = (String)key; s1 = (String)key;
for (s2 = (char *)s1; c = *s2++; ) for (s2 = (char *)s1; (c = *s2++); )
sig = (sig << 1) + c; sig = (sig << 1) + c;
len = s2 - s1 - 1; len = s2 - s1 - 1;
} }
@ -127,7 +127,7 @@ GetTableIndex(
sig = (Signature)key; sig = (Signature)key;
idx = HASH(tab, sig); idx = HASH(tab, sig);
while (entry = entries[idx]) { while ((entry = entries[idx])) {
if (entries[idx] == &DtHashfake) { if (entries[idx] == &DtHashfake) {
if (new) if (new)
return idx; return idx;

1
cde/lib/DtSvc/DtUtil2/MsgCat.c
View file

@ -38,6 +38,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <nl_types.h> #include <nl_types.h>
#include <X11/Intrinsic.h>
#include <Dt/MsgCatP.h> #include <Dt/MsgCatP.h>
#include <DtSvcLock.h> #include <DtSvcLock.h>

3
cde/lib/DtSvc/DtUtil2/PrintXErr.c
View file

@ -45,6 +45,8 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xlibint.h> #include <X11/Xlibint.h>
#include <Dt/UserMsg.h>
int int
_DtPrintDefaultError( _DtPrintDefaultError(
Display *dpy, Display *dpy,
@ -52,6 +54,7 @@ _DtPrintDefaultError(
char *msg ) char *msg )
{ {
_DtPrintDefaultErrorSafe(dpy, event, msg, BUFSIZ); _DtPrintDefaultErrorSafe(dpy, event, msg, BUFSIZ);
/* XXX retval? */
} }
#define _DTP_STRNCAT(s1, s2, nb, ec) \ #define _DTP_STRNCAT(s1, s2, nb, ec) \

1
cde/lib/DtSvc/DtUtil2/SharedProcs.c
View file

@ -43,6 +43,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <ctype.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>

13
cde/lib/DtSvc/DtUtil2/SmCreateDirs.c
View file

@ -38,6 +38,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xlibint.h> #include <X11/Xlibint.h>
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
@ -262,9 +263,9 @@ GetShortHostname(
char * ptr; char * ptr;
int status; int status;
if (status = gethostname(buffer, bufsize)) if ((status = gethostname(buffer, bufsize)))
return status; /* failed gethostname */ return status; /* failed gethostname */
if (ptr = strstr(buffer, (char *)".")) if ((ptr = strstr(buffer, (char *)".")))
*ptr = '\0'; /* delete domain name if there is one */ *ptr = '\0'; /* delete domain name if there is one */
return 0; return 0;
} }
@ -332,10 +333,10 @@ GetDisplayName (
/* /*
* Strip host name to nothing but the unqualified (short) host name * Strip host name to nothing but the unqualified (short) host name
*/ */
if (pch = DtStrchr(hostName, ':')) if ((pch = DtStrchr(hostName, ':')))
*pch = '\0'; *pch = '\0';
if (pch = DtStrchr(hostName, '.')) if ((pch = DtStrchr(hostName, '.')))
*pch = '\0'; *pch = '\0';
if((!strcmp(hostName, "unix")) || (!strcmp(hostName, "local")) if((!strcmp(hostName, "unix")) || (!strcmp(hostName, "local"))
@ -350,8 +351,8 @@ GetDisplayName (
/* /*
* Strip screen off of display name * Strip screen off of display name
*/ */
if (tmpNumber = DtStrchr(displayName, ':')) if ((tmpNumber = DtStrchr(displayName, ':')))
if (pch = DtStrchr(tmpNumber, '.')) if ((pch = DtStrchr(tmpNumber, '.')))
*pch = '\0'; *pch = '\0';
/* /*

4
cde/lib/DtSvc/DtUtil2/Utility.c
View file

@ -125,7 +125,7 @@ _DtVectorizeInPlace(
vector. There is one more element than separator characters. */ vector. There is one more element than separator characters. */
num_pieces = 1; num_pieces = 1;
nextc = string; nextc = string;
while (nextc = DtStrchr(nextc, separator)) while ((nextc = DtStrchr(nextc, separator)))
{ {
num_pieces++; num_pieces++;
nextc++; nextc++;
@ -140,7 +140,7 @@ _DtVectorizeInPlace(
nextc = string; nextc = string;
/* Parse out each component, terminating it with a NULL */ /* Parse out each component, terminating it with a NULL */
while (nextc = DtStrchr(nextc, separator)) while ((nextc = DtStrchr(nextc, separator)))
{ {
*nextc = '\0'; *nextc = '\0';
nextc++; nextc++;

2
cde/lib/DtSvc/DtUtil2/XlationSvc.c
View file

@ -35,9 +35,11 @@ $END$
**************************************************************************** ****************************************************************************
************************************<+>*************************************/ ************************************<+>*************************************/
#include <ctype.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#if defined(sun) #if defined(sun)
#include <sys/utsname.h> #include <sys/utsname.h>
#endif #endif

1
cde/lib/DtSvc/DtUtil2/XmWrap.c
View file

@ -29,6 +29,7 @@
*/ */
#include <Xm/XmP.h> #include <Xm/XmP.h>
#include <Xm/IconFile.h> #include <Xm/IconFile.h>
#include <Xm/XmPrivate.h>
#ifdef DtUse_XmFunctions #ifdef DtUse_XmFunctions