diff --git a/cde/lib/tt/bin/ttdbserverd/db_server_svc.C b/cde/lib/tt/bin/ttdbserverd/db_server_svc.C index b8bce583b..fbec3d418 100644 --- a/cde/lib/tt/bin/ttdbserverd/db_server_svc.C +++ b/cde/lib/tt/bin/ttdbserverd/db_server_svc.C @@ -213,14 +213,14 @@ main(int argc, char** argv, char **envp) char *progname; void install_signal_handler(); SVCXPRT *transp; - struct sockaddr_in saddr; + struct sockaddr_in saddr; #if defined(DEC) || defined(HPUX) - int asize = sizeof(struct sockaddr); + int asize = sizeof(saddr); #else # if defined(linux) || defined(CSRG_BASED) || defined(sun) - socklen_t asize; + socklen_t asize = sizeof(saddr); # else - size_t asize = sizeof(struct sockaddr); + size_t asize = sizeof(saddr); # endif #endif int is_aix = 0; @@ -232,7 +232,7 @@ main(int argc, char** argv, char **envp) struct t_info info; #endif - memset((char *)&saddr,0,sizeof(struct sockaddr)); + memset(&saddr, 0, sizeof(saddr)); #if defined(OPT_TLI) memset((char *)&info,0,sizeof info); diff --git a/cde/lib/tt/lib/api/c/api_pattern.C b/cde/lib/tt/lib/api/c/api_pattern.C index d3cd6805c..88d7be158 100644 --- a/cde/lib/tt/lib/api/c/api_pattern.C +++ b/cde/lib/tt/lib/api/c/api_pattern.C @@ -1159,7 +1159,7 @@ _tt_pattern_context_add(Tt_pattern p, const char *slotname, const char *value) { _Tt_pattern_ptr pat = _tt_htab->lookup_pat(p); _Tt_pat_context_ptr cntxt; - Tt_status status; + Tt_status status = TT_OK; int add = 0; cntxt = pat->context(slotname); @@ -1175,7 +1175,7 @@ _tt_pattern_context_add(Tt_pattern p, const char *slotname, const char *value) add = 1; } // NULL value means leave value unset (which matches everything) - if (value != (char *)0) { + if (value != NULL) { _Tt_string valString(value); status = cntxt->addValue(valString); if (status != TT_OK) { @@ -1277,7 +1277,7 @@ _tt_pattern_bcontext_add(Tt_pattern p, const char *slotname, { _Tt_pattern_ptr pat = _tt_htab->lookup_pat(p); _Tt_pat_context_ptr cntxt; - Tt_status status; + Tt_status status = TT_OK; int add = 0; @@ -1294,7 +1294,7 @@ _tt_pattern_bcontext_add(Tt_pattern p, const char *slotname, add = 1; } // NULL value means leave value unset (which matches everything) - if (value != (unsigned char *)0) { + if (value != NULL) { _Tt_string valString( value, len ); status = cntxt->addValue( valString ); diff --git a/cde/lib/tt/lib/mp/mp_stream_socket.C b/cde/lib/tt/lib/mp/mp_stream_socket.C index fb2ba5af3..f92215ffe 100644 --- a/cde/lib/tt/lib/mp/mp_stream_socket.C +++ b/cde/lib/tt/lib/mp/mp_stream_socket.C @@ -178,7 +178,8 @@ init(int init_as_source) #else int len; #endif - int optval; + int optval = 1; + _sock = socket(AF_INET, SOCK_STREAM, 0); if (_sock < 0) { _tt_syslog( 0, LOG_ERR, @@ -194,7 +195,6 @@ init(int init_as_source) _is_source = init_as_source; if (init_as_source) { /* 'from' end of socket */ #if !defined(OPT_TLI) - optval = 1; #ifndef linux if (setsockopt(_sock, SOL_SOCKET, SO_USELOOPBACK, (char *)&optval, sizeof(int)) == -1) { diff --git a/cde/lib/tt/mini_isam/isbuild.c b/cde/lib/tt/mini_isam/isbuild.c index 517d057d0..91316346a 100644 --- a/cde/lib/tt/mini_isam/isbuild.c +++ b/cde/lib/tt/mini_isam/isbuild.c @@ -206,7 +206,7 @@ _ambuild(isfname, openmode, varflag, minlen, maxlen, primkey, { Fcb *fcb = NULL; Bytearray *isfhandle2; - Bytearray isfhandle0; + Bytearray isfhandle0 = _bytearr_getempty(); Keydesc2 keydesc2; int err; Crp *crp; diff --git a/cde/lib/tt/mini_isam/isgarbage.c b/cde/lib/tt/mini_isam/isgarbage.c index 521ca521c..c270e5d95 100644 --- a/cde/lib/tt/mini_isam/isgarbage.c +++ b/cde/lib/tt/mini_isam/isgarbage.c @@ -36,7 +36,7 @@ isgarbage(char * isfname) char isfname2[MAXPATHLEN]; int isfd = -1, isfd2 = -1; char buffer[ISMAXRECLEN]; - char *recbuf; + char *recbuf = NULL; struct dictinfo info; struct keydesc keybuf; struct stat statbuf; @@ -121,7 +121,9 @@ isgarbage(char * isfname) (void)isclose(isfd2); (void)iserase(isfname2); } - if (recbuf != buffer) free(recbuf); + if ((recbuf != buffer) && (recbuf != NULL)) { + free(recbuf); + } return (ISERROR); }