From d470302354c1daf58be018fb434cc04d62fc79f7 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sat, 11 Dec 2021 14:45:33 -0700 Subject: [PATCH] Fix several pointer-bool-conversion warnings that could cause cores --- cde/programs/dtcreate/af_aux.c | 6 +++--- cde/programs/dtcreate/cmnrtns.c | 2 +- cde/programs/dtcreate/main.c | 2 +- cde/programs/dticon/fileIO.c | 19 +++++++++++-------- cde/programs/dticon/utils.c | 2 +- cde/programs/dtstyle/MainWin.c | 2 +- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/cde/programs/dtcreate/af_aux.c b/cde/programs/dtcreate/af_aux.c index f5ebf2d2d..46297fba1 100644 --- a/cde/programs/dtcreate/af_aux.c +++ b/cde/programs/dtcreate/af_aux.c @@ -220,7 +220,7 @@ void getAF_Icons(FiletypeData *pFiletypedata) /***************************************************************/ pIconData = GetIconDataFromWid(AF_MED_IconGadget); if ( (pIconData->pmDirtyBit) && - (pIconData->pmFileName) && + (pIconData->pmFileName[0]) && (strlen(pIconData->pmFileName)) ) { pFiletypedata->pszMedPmIcon = XtMalloc(strlen(pIconData->pmFileName) + 1); if (pFiletypedata->pszMedPmIcon) { @@ -234,7 +234,7 @@ void getAF_Icons(FiletypeData *pFiletypedata) /* Medium Bitmap */ /***************************************************************/ if ( (pIconData->bmDirtyBit) && - (pIconData->bmFileName) && + (pIconData->bmFileName[0]) && (strlen(pIconData->bmFileName)) ) { pFiletypedata->pszMedBmIcon = XtMalloc(strlen(pIconData->bmFileName) + 1); if (pFiletypedata->pszMedBmIcon) { @@ -249,7 +249,7 @@ void getAF_Icons(FiletypeData *pFiletypedata) /***************************************************************/ pIconData = GetIconDataFromWid(AF_TINY_IconGadget); if ( (pIconData->pmDirtyBit) && - (pIconData->pmFileName) && + (pIconData->pmFileName[0]) && (strlen(pIconData->pmFileName)) ) { pFiletypedata->pszTinyPmIcon = XtMalloc(strlen(pIconData->pmFileName) + 1); if (pFiletypedata->pszTinyPmIcon) { diff --git a/cde/programs/dtcreate/cmnrtns.c b/cde/programs/dtcreate/cmnrtns.c index 56e7272ae..acab64784 100644 --- a/cde/programs/dtcreate/cmnrtns.c +++ b/cde/programs/dtcreate/cmnrtns.c @@ -700,7 +700,7 @@ void SetIconData(Widget wid, char *pszIconFile, enum icon_size_range enumIconSiz pIconData = GetIconDataFromWid(wid); if (pIconData) { if ( (pIconData->pmDirtyBit) && - (pIconData->pmFileName) && + (pIconData->pmFileName[0]) && (strlen(pIconData->pmFileName)) ) { #ifdef DEBUG printf("SetIconData: unlink '%s'\n", pIconData->pmFileName); /* debug */ diff --git a/cde/programs/dtcreate/main.c b/cde/programs/dtcreate/main.c index 5dd83254b..c96964a0d 100644 --- a/cde/programs/dtcreate/main.c +++ b/cde/programs/dtcreate/main.c @@ -634,7 +634,7 @@ void RemoveTmpIconFiles( void ) for (i=0; i < ICON_NUMBER; i++) { if ( (IconDataList[i]->pmDirtyBit) && - (IconDataList[i]->pmFileName) && + (IconDataList[i]->pmFileName[0]) && (strlen(IconDataList[i]->pmFileName)) ) { #ifdef DEBUG printf("RemoveTmpIconFiles: unlink '%s'\n", IconDataList[i]->pmFileName); /* debug */ diff --git a/cde/programs/dticon/fileIO.c b/cde/programs/dticon/fileIO.c index 57f86cb34..aeaa57250 100644 --- a/cde/programs/dticon/fileIO.c +++ b/cde/programs/dticon/fileIO.c @@ -221,10 +221,13 @@ Boolean Read_File( char *fnameIn ) { - char *base_name, *suffix, fname[MAXPATHLEN+1], *tmp, *tmp2; - unsigned int mask_width_ret, mask_height_ret; - int mask_x_hot, mask_y_hot, first; - struct stat statBuf; + char *base_name = NULL, *suffix = NULL, + fname[MAXPATHLEN], *tmp = NULL, *tmp2 = NULL; + unsigned int mask_width_ret = 0, mask_height_ret = 0; + int mask_x_hot = 0, mask_y_hot = 0, first = 0; + struct stat statBuf = {}; + + fname[0] = 0; #ifdef DEBUG if (debug) @@ -241,7 +244,7 @@ Read_File( if (tmp && tmp2 && (tmp2 == tmp+1)) { char *netfile, *localfile; - + tmp[0] = '\0'; netfile = tt_host_file_netfile(fnameIn, tmp+1); localfile = tt_netfile_file(netfile); @@ -259,7 +262,7 @@ Read_File( /*** - if we got a NULL base_name, return FALSE ***/ base_name = strrchr(fname, '/'); - if (fname) + if (fname[0]) base_name = (base_name ? base_name + 1 : fname); if (!base_name) return (False); @@ -491,7 +494,7 @@ Write_File( base_name = strrchr(fname, '/'); - if (fname) { + if (fname[0]) { base_name = (base_name ? base_name + 1 : fname); } @@ -735,7 +738,7 @@ Display_XPMFile( reset_debug = True; } #endif - PixelTableClear; /* force new pixel table now */ + PixelTableClear(); /* force new pixel table now */ for (i=0; i