Resolve some coverity warnings
This commit is contained in:
@@ -57,6 +57,8 @@
|
||||
*****************************************************************************
|
||||
*************************************<+>*************************************/
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/types.h>
|
||||
@@ -1161,7 +1163,10 @@ SetSavePath(
|
||||
smGD.resourcePath[0] = 0;
|
||||
return(-1);
|
||||
}
|
||||
chmod(smGD.clientPath, 0755);
|
||||
if(-1 == chmod(smGD.clientPath, 0755))
|
||||
{
|
||||
fprintf(stderr, "%s chmod error %s\n", smGD.clientPath, strerror(errno));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1293,7 +1298,10 @@ SetFontSavePath(char *langPtr)
|
||||
smGD.fontPath[0] = 0;
|
||||
return(-1);
|
||||
}
|
||||
chmod(smGD.fontPath, 0755);
|
||||
if(-1 == chmod(smGD.fontPath, 0755))
|
||||
{
|
||||
fprintf(stderr, "%s chmod error %s\n", smGD.fontPath, strerror(errno));
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -161,8 +161,8 @@ static Boolean CanReAuthenticate(char *name, uid_t uid, char *passwd,
|
||||
{
|
||||
Boolean fail = False;
|
||||
|
||||
*pwent = (name == NULL) ? getpwuid(uid) : getpwnam(name);
|
||||
if (pwent)
|
||||
*pwent = (name == NULL) ? getpwuid(uid) : getpwnam(name);
|
||||
*spent = getspnam((*pwent)->pw_name);
|
||||
|
||||
#ifdef JET_AUTHDEBUG
|
||||
|
||||
@@ -2013,6 +2013,7 @@ RestoreClients( void )
|
||||
SM_FREE((char *) remoteBuf[i]);
|
||||
}
|
||||
}
|
||||
free(displayName);
|
||||
return(-1);
|
||||
}
|
||||
hintPtr = NULL;
|
||||
|
||||
@@ -1620,12 +1620,12 @@ OutputResource( void )
|
||||
langPtr = getenv("LANG");
|
||||
if((langPtr != NULL) && (*langPtr != 0))
|
||||
{
|
||||
sprintf(resSpec, "%s*%s: %s\n", SM_RESOURCE_NAME, SmNsessionLang,
|
||||
snprintf(resSpec, resSize, "%s*%s: %s\n", SM_RESOURCE_NAME, SmNsessionLang,
|
||||
langPtr);
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(resSpec, "%s*%s: \n", SM_RESOURCE_NAME, SmNsessionLang);
|
||||
snprintf(resSpec, resSize, "%s*%s: \n", SM_RESOURCE_NAME, SmNsessionLang);
|
||||
}
|
||||
|
||||
fltYRes = ((float) DisplayHeight(smGD.display, 0) /
|
||||
|
||||
@@ -594,10 +594,12 @@ static
|
||||
|
||||
/* read the directory $HOME/.dt/backdrops */
|
||||
string = (char *)XtMalloc(strlen(style.home) + strlen("/.dt/backdrops") + 1);
|
||||
sprintf(string, "%s/.dt/backdrops", style.home);
|
||||
ReadBitmapDirectory(string);
|
||||
if (string != NULL)
|
||||
{
|
||||
sprintf(string, "%s/.dt/backdrops", style.home);
|
||||
ReadBitmapDirectory(string);
|
||||
XtFree(string);
|
||||
}
|
||||
|
||||
if (backdrops.tmpNumBitmaps == 0)
|
||||
{
|
||||
|
||||
@@ -243,12 +243,13 @@ GetUserIMSelectionFile(
|
||||
|
||||
ret = GetUserFileName(env);
|
||||
|
||||
if (ret == NoError) {
|
||||
/* Look if this file is readable */
|
||||
if ((fp = fopen(env->file_sel->fname, "r")) == NULL)
|
||||
env->file_sel->start_mode = -1;
|
||||
return ErrNoSelectionFile;
|
||||
}
|
||||
if (ret == NoError) {
|
||||
/* Look if this file is readable */
|
||||
if ((fp = fopen(env->file_sel->fname, "r")) == NULL) {
|
||||
env->file_sel->start_mode = -1;
|
||||
return ErrNoSelectionFile;
|
||||
}
|
||||
}
|
||||
|
||||
start_tag_line(env->file_sel->fname);
|
||||
ret = ReadImSelectionFile(env->file_sel, fp);
|
||||
@@ -314,31 +315,33 @@ ReadImSelectionFile(
|
||||
|
||||
imsname = hostname = NULL;
|
||||
|
||||
while ((line_num = read_tag_line(fp, &lp, &valp)) > 0) {
|
||||
if (!valp) {
|
||||
continue;
|
||||
while ((line_num = read_tag_line(fp, &lp, &valp)) > 0) {
|
||||
if (!valp) {
|
||||
continue;
|
||||
}
|
||||
if (lp[0] != STR_PREFIX_CHAR) {
|
||||
continue;
|
||||
}
|
||||
if (strncmp(lp + 1, STR_SELECTMODE, 3) == 0) {
|
||||
if (str_to_int(valp, &i) && i >= 0) {
|
||||
select_mode = i;
|
||||
}
|
||||
} else if (strncmp(lp + 1, STR_IMSNAME, 4) == 0) {
|
||||
vp = valp; cut_field(valp);
|
||||
if (*vp) {
|
||||
XtFree(imsname);
|
||||
imsname = XtNewString(vp);
|
||||
}
|
||||
} else if (strncmp(lp + 1, STR_HOSTNAME, 4) == 0) {
|
||||
vp = valp; cut_field(valp);
|
||||
if (*vp) {
|
||||
XtFree(hostname);
|
||||
if (strcmp(vp, NAME_LOCAL)) {
|
||||
hostname = XtNewString(vp);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (lp[0] != STR_PREFIX_CHAR) {
|
||||
continue;
|
||||
}
|
||||
if (strncmp(lp + 1, STR_SELECTMODE, 3) == 0) {
|
||||
if (str_to_int(valp, &i) && i >= 0)
|
||||
select_mode = i;
|
||||
} else if (strncmp(lp + 1, STR_IMSNAME, 4) == 0) {
|
||||
vp = valp; cut_field(valp);
|
||||
if (*vp) {
|
||||
XtFree(imsname);
|
||||
imsname = XtNewString(vp);
|
||||
}
|
||||
} else if (strncmp(lp + 1, STR_HOSTNAME, 4) == 0) {
|
||||
vp = valp; cut_field(valp);
|
||||
if (*vp) {
|
||||
XtFree(hostname);
|
||||
if (strcmp(vp, NAME_LOCAL))
|
||||
hostname = XtNewString(vp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fsel->im_name = imsname;
|
||||
fsel->hostname = hostname;
|
||||
@@ -372,7 +375,7 @@ _DtI18nGetImList(
|
||||
|
||||
case HOST_LOCAL:
|
||||
if (hostname && strcasecmp(hostname, "local") != 0)
|
||||
env->ims_sel->host_name = hostname;
|
||||
env->ims_sel->host_name = hostname;
|
||||
ret = GetImsList(env, env->user_env->localhostname);
|
||||
break;
|
||||
}
|
||||
@@ -631,6 +634,8 @@ _DtI18nWriteImSelectionFile(
|
||||
|
||||
/* Close the file */
|
||||
fclose(fp);
|
||||
|
||||
return NoError;
|
||||
}
|
||||
|
||||
static void
|
||||
|
||||
Reference in New Issue
Block a user