mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-02-15 04:32:24 +00:00
libtt: Fix some uninitialized variables detected by Coverity
This commit is contained in:
parent
8ed5281e3e
commit
be49dc56bc
5 changed files with 16 additions and 14 deletions
|
@ -213,14 +213,14 @@ main(int argc, char** argv, char **envp)
|
||||||
char *progname;
|
char *progname;
|
||||||
void install_signal_handler();
|
void install_signal_handler();
|
||||||
SVCXPRT *transp;
|
SVCXPRT *transp;
|
||||||
struct sockaddr_in saddr;
|
struct sockaddr_in saddr;
|
||||||
#if defined(DEC) || defined(HPUX)
|
#if defined(DEC) || defined(HPUX)
|
||||||
int asize = sizeof(struct sockaddr);
|
int asize = sizeof(saddr);
|
||||||
#else
|
#else
|
||||||
# if defined(linux) || defined(CSRG_BASED) || defined(sun)
|
# if defined(linux) || defined(CSRG_BASED) || defined(sun)
|
||||||
socklen_t asize;
|
socklen_t asize = sizeof(saddr);
|
||||||
# else
|
# else
|
||||||
size_t asize = sizeof(struct sockaddr);
|
size_t asize = sizeof(saddr);
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
int is_aix = 0;
|
int is_aix = 0;
|
||||||
|
@ -232,7 +232,7 @@ main(int argc, char** argv, char **envp)
|
||||||
struct t_info info;
|
struct t_info info;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
memset((char *)&saddr,0,sizeof(struct sockaddr));
|
memset(&saddr, 0, sizeof(saddr));
|
||||||
|
|
||||||
#if defined(OPT_TLI)
|
#if defined(OPT_TLI)
|
||||||
memset((char *)&info,0,sizeof info);
|
memset((char *)&info,0,sizeof info);
|
||||||
|
|
|
@ -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_pattern_ptr pat = _tt_htab->lookup_pat(p);
|
||||||
_Tt_pat_context_ptr cntxt;
|
_Tt_pat_context_ptr cntxt;
|
||||||
Tt_status status;
|
Tt_status status = TT_OK;
|
||||||
|
|
||||||
int add = 0;
|
int add = 0;
|
||||||
cntxt = pat->context(slotname);
|
cntxt = pat->context(slotname);
|
||||||
|
@ -1175,7 +1175,7 @@ _tt_pattern_context_add(Tt_pattern p, const char *slotname, const char *value)
|
||||||
add = 1;
|
add = 1;
|
||||||
}
|
}
|
||||||
// NULL value means leave value unset (which matches everything)
|
// NULL value means leave value unset (which matches everything)
|
||||||
if (value != (char *)0) {
|
if (value != NULL) {
|
||||||
_Tt_string valString(value);
|
_Tt_string valString(value);
|
||||||
status = cntxt->addValue(valString);
|
status = cntxt->addValue(valString);
|
||||||
if (status != TT_OK) {
|
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_pattern_ptr pat = _tt_htab->lookup_pat(p);
|
||||||
_Tt_pat_context_ptr cntxt;
|
_Tt_pat_context_ptr cntxt;
|
||||||
Tt_status status;
|
Tt_status status = TT_OK;
|
||||||
|
|
||||||
|
|
||||||
int add = 0;
|
int add = 0;
|
||||||
|
@ -1294,7 +1294,7 @@ _tt_pattern_bcontext_add(Tt_pattern p, const char *slotname,
|
||||||
add = 1;
|
add = 1;
|
||||||
}
|
}
|
||||||
// NULL value means leave value unset (which matches everything)
|
// NULL value means leave value unset (which matches everything)
|
||||||
if (value != (unsigned char *)0) {
|
if (value != NULL) {
|
||||||
_Tt_string valString( value, len );
|
_Tt_string valString( value, len );
|
||||||
|
|
||||||
status = cntxt->addValue( valString );
|
status = cntxt->addValue( valString );
|
||||||
|
|
|
@ -178,7 +178,8 @@ init(int init_as_source)
|
||||||
#else
|
#else
|
||||||
int len;
|
int len;
|
||||||
#endif
|
#endif
|
||||||
int optval;
|
int optval = 1;
|
||||||
|
|
||||||
_sock = socket(AF_INET, SOCK_STREAM, 0);
|
_sock = socket(AF_INET, SOCK_STREAM, 0);
|
||||||
if (_sock < 0) {
|
if (_sock < 0) {
|
||||||
_tt_syslog( 0, LOG_ERR,
|
_tt_syslog( 0, LOG_ERR,
|
||||||
|
@ -194,7 +195,6 @@ init(int init_as_source)
|
||||||
_is_source = init_as_source;
|
_is_source = init_as_source;
|
||||||
if (init_as_source) { /* 'from' end of socket */
|
if (init_as_source) { /* 'from' end of socket */
|
||||||
#if !defined(OPT_TLI)
|
#if !defined(OPT_TLI)
|
||||||
optval = 1;
|
|
||||||
#ifndef linux
|
#ifndef linux
|
||||||
if (setsockopt(_sock, SOL_SOCKET, SO_USELOOPBACK,
|
if (setsockopt(_sock, SOL_SOCKET, SO_USELOOPBACK,
|
||||||
(char *)&optval, sizeof(int)) == -1) {
|
(char *)&optval, sizeof(int)) == -1) {
|
||||||
|
|
|
@ -206,7 +206,7 @@ _ambuild(isfname, openmode, varflag, minlen, maxlen, primkey,
|
||||||
{
|
{
|
||||||
Fcb *fcb = NULL;
|
Fcb *fcb = NULL;
|
||||||
Bytearray *isfhandle2;
|
Bytearray *isfhandle2;
|
||||||
Bytearray isfhandle0;
|
Bytearray isfhandle0 = _bytearr_getempty();
|
||||||
Keydesc2 keydesc2;
|
Keydesc2 keydesc2;
|
||||||
int err;
|
int err;
|
||||||
Crp *crp;
|
Crp *crp;
|
||||||
|
|
|
@ -36,7 +36,7 @@ isgarbage(char * isfname)
|
||||||
char isfname2[MAXPATHLEN];
|
char isfname2[MAXPATHLEN];
|
||||||
int isfd = -1, isfd2 = -1;
|
int isfd = -1, isfd2 = -1;
|
||||||
char buffer[ISMAXRECLEN];
|
char buffer[ISMAXRECLEN];
|
||||||
char *recbuf;
|
char *recbuf = NULL;
|
||||||
struct dictinfo info;
|
struct dictinfo info;
|
||||||
struct keydesc keybuf;
|
struct keydesc keybuf;
|
||||||
struct stat statbuf;
|
struct stat statbuf;
|
||||||
|
@ -121,7 +121,9 @@ isgarbage(char * isfname)
|
||||||
(void)isclose(isfd2);
|
(void)isclose(isfd2);
|
||||||
(void)iserase(isfname2);
|
(void)iserase(isfname2);
|
||||||
}
|
}
|
||||||
if (recbuf != buffer) free(recbuf);
|
if ((recbuf != buffer) && (recbuf != NULL)) {
|
||||||
|
free(recbuf);
|
||||||
|
}
|
||||||
return (ISERROR);
|
return (ISERROR);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue