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

libdthelp: resolve 46 compiler warnings

Browse source
This commit is contained in:
Peter Howkins 2012-10-08 15:34:45 +01:00
parent c3c9abd86f
commit cd39eabb18
17 changed files with 45 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cde/lib/DtHelp/Access.c
View file

@ -696,7 +696,7 @@ _DtHelpCeExpandPathname (
#define MY_NUM 7 #define MY_NUM 7
_DtSubstitutionRec mySubs [MY_NUM]; _DtSubstitutionRec mySubs [MY_NUM];
if (spec == NULL || *spec == NULL) if (spec == NULL || *spec == '\0')
{ {
errno = EINVAL; errno = EINVAL;
return NULL; return NULL;
@ -2404,7 +2404,7 @@ _DtHelpCeGetDocStamp (
{ {
errno = EINVAL; errno = EINVAL;
_DtHelpProcessUnlock(); _DtHelpProcessUnlock();
return NULL; return 0;
} }
/* /*

2
cde/lib/DtHelp/AccessSDL.c
View file

@ -1127,7 +1127,7 @@ _DtHelpCeGetSdlIdPath(
*ret_ids = NULL; *ret_ids = NULL;
if (_DtHelpCeGetSdlVolIds(volume, -1, &idSegs) != 0) if (_DtHelpCeGetSdlVolIds(volume, -1, &idSegs) != 0)
return NULL; return 0;
if (_SdlVolumeMinorNumber(_DtHelpCeGetSdlVolumePtr(volume)) >= SDL_DTD_1_1) if (_SdlVolumeMinorNumber(_DtHelpCeGetSdlVolumePtr(volume)) >= SDL_DTD_1_1)
hiddenNo = 0; hiddenNo = 0;

8
cde/lib/DtHelp/Callbacks.c
View file

@ -351,7 +351,7 @@ ScrollTimerCB (
if (*id != pDAS->scr_timer_id) if (*id != pDAS->scr_timer_id)
return; return;
pDAS->scr_timer_id = NULL; pDAS->scr_timer_id = 0;
maxY = pDAS->maxYpos; maxY = pDAS->maxYpos;
dispY = pDAS->firstVisible + pDAS->dispUseHeight; dispY = pDAS->firstVisible + pDAS->dispUseHeight;
@ -604,7 +604,7 @@ _DtHelpCancelSelection(
if (pDAS->scr_timer_id) if (pDAS->scr_timer_id)
{ {
XtRemoveTimeOut (pDAS->scr_timer_id); XtRemoveTimeOut (pDAS->scr_timer_id);
pDAS->scr_timer_id = NULL; pDAS->scr_timer_id = 0;
} }
_DtHelpClearSelection (client_data); _DtHelpClearSelection (client_data);
} }
@ -1067,7 +1067,7 @@ _DtHelpEndSelectionCB (
if (pDAS->scr_timer_id) if (pDAS->scr_timer_id)
{ {
XtRemoveTimeOut (pDAS->scr_timer_id); XtRemoveTimeOut (pDAS->scr_timer_id);
pDAS->scr_timer_id = NULL; pDAS->scr_timer_id = 0;
} }
newX = callback->event->xbutton.x; newX = callback->event->xbutton.x;
@ -1140,7 +1140,7 @@ _DtHelpMouseMoveCB(
if (pDAS->scr_timer_id) if (pDAS->scr_timer_id)
{ {
XtRemoveTimeOut (pDAS->scr_timer_id); XtRemoveTimeOut (pDAS->scr_timer_id);
pDAS->scr_timer_id = NULL; pDAS->scr_timer_id = 0;
} }
newX = event->xmotion.x; newX = event->xmotion.x;

2
cde/lib/DtHelp/Destroy.c
View file

@ -161,7 +161,7 @@ _DtHelpDisplayAreaDestroyCB (
XFreeGC (dpy, pDAS->normalGC); XFreeGC (dpy, pDAS->normalGC);
XFreeGC (dpy, pDAS->pixmapGC); XFreeGC (dpy, pDAS->pixmapGC);
XFreeGC (dpy, pDAS->invertGC); XFreeGC (dpy, pDAS->invertGC);
if (pDAS->def_pix != NULL && if (pDAS->def_pix != 0 &&
XmDestroyPixmap(XDefaultScreenOfDisplay(dpy), pDAS->def_pix) == False) XmDestroyPixmap(XDefaultScreenOfDisplay(dpy), pDAS->def_pix) == False)
XFreePixmap(dpy, pDAS->def_pix); XFreePixmap(dpy, pDAS->def_pix);
if (pDAS->context != NULL) if (pDAS->context != NULL)

14
cde/lib/DtHelp/Font.c
View file

@ -264,7 +264,7 @@ static const char *FontResources[] =
#define GROW_SIZE 5 #define GROW_SIZE 5
static Boolean QuarksInited = FALSE; static Boolean QuarksInited = FALSE;
static XrmQuark StringFontQuark = NULL; static XrmQuark StringFontQuark = 0;
static XrmName DefaultFontQuarks[_DtHelpFontQuarkNumber]; static XrmName DefaultFontQuarks[_DtHelpFontQuarkNumber];
static XrmBinding FontBindings[_DtHelpFontQuarkNumber] = static XrmBinding FontBindings[_DtHelpFontQuarkNumber] =
{ XrmBindLoosely, XrmBindLoosely, XrmBindLoosely, XrmBindLoosely, { XrmBindLoosely, XrmBindLoosely, XrmBindLoosely, XrmBindLoosely,
@ -272,7 +272,7 @@ static XrmBinding FontBindings[_DtHelpFontQuarkNumber] =
static DtHelpDAFSMetrics DefaultMetrics = { FALSE, 0, 0 }; static DtHelpDAFSMetrics DefaultMetrics = { FALSE, 0, 0 };
static DtHelpDAFontInfo DefFontInfo = { NULL, NULL, NULL, NULL, NULL, static DtHelpDAFontInfo DefFontInfo = { NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, 0, 0, 0, 0, 0}; NULL, 0, NULL, 0, 0, 0, 0, 0};
/****************************************************************************** /******************************************************************************
* *
@ -546,7 +546,7 @@ __DtHelpFontIndexGet (
retValue.addr = (XtPointer) &xrm_list[_DT_HELP_FONT_CHAR_SET]; retValue.addr = (XtPointer) &xrm_list[_DT_HELP_FONT_CHAR_SET];
xrmList[0] = XrmStringToQuark (buffer); xrmList[0] = XrmStringToQuark (buffer);
xrmList[1] = XrmStringToQuark ("code_set"); xrmList[1] = XrmStringToQuark ("code_set");
xrmList[2] = NULL; xrmList[2] = 0;
XrmQPutResource (&(fontInfo->font_idx_db), XrmQPutResource (&(fontInfo->font_idx_db),
((XrmBindingList) FontBindings), ((XrmBindingList) FontBindings),
xrmList, _DtHelpXrmQuark, &retValue); xrmList, _DtHelpXrmQuark, &retValue);
@ -596,7 +596,7 @@ __DtHelpFontCharSetQuarkGet (
sprintf (buffer, "%d", font_index); sprintf (buffer, "%d", font_index);
xrmList[0] = XrmStringToQuark (buffer); xrmList[0] = XrmStringToQuark (buffer);
xrmList[1] = XrmStringToQuark ("code_set"); xrmList[1] = XrmStringToQuark ("code_set");
xrmList[2] = NULL; xrmList[2] = 0;
/* /*
* look in my font data base for the quark. * look in my font data base for the quark.
@ -640,7 +640,7 @@ __DtHelpFontLangQuarkGet (
sprintf (buffer, "%d", font_index); sprintf (buffer, "%d", font_index);
xrmList[0] = XrmStringToQuark (buffer); xrmList[0] = XrmStringToQuark (buffer);
xrmList[1] = XrmStringToQuark ("language"); xrmList[1] = XrmStringToQuark ("language");
xrmList[2] = NULL; xrmList[2] = 0;
/* /*
* look in my font data base for the quark. * look in my font data base for the quark.
@ -743,7 +743,7 @@ __DtHelpFontDatabaseInit (
DefaultFontQuarks[_DT_HELP_FONT_LANG_TER] = XrmStringToQuark ("C"); DefaultFontQuarks[_DT_HELP_FONT_LANG_TER] = XrmStringToQuark ("C");
DefaultFontQuarks[_DT_HELP_FONT_CHAR_SET] = DefaultFontQuarks[_DT_HELP_FONT_CHAR_SET] =
XrmStringToQuark ("ISO-8859-1"); XrmStringToQuark ("ISO-8859-1");
DefaultFontQuarks[_DT_HELP_FONT_END] = NULL; DefaultFontQuarks[_DT_HELP_FONT_END] = 0;
QuarksInited = True; QuarksInited = True;
} }
_DtHelpProcessUnlock(); _DtHelpProcessUnlock();
@ -1053,7 +1053,7 @@ _DtHelpGetExactFontIndex (
retValue.addr = (XtPointer) &myQuark; retValue.addr = (XtPointer) &myQuark;
xrmList[0] = XrmStringToQuark (buffer); xrmList[0] = XrmStringToQuark (buffer);
xrmList[1] = XrmStringToQuark ("code_set"); xrmList[1] = XrmStringToQuark ("code_set");
xrmList[2] = NULL; xrmList[2] = 0;
XrmQPutResource (&(fontInfo->font_idx_db), XrmQPutResource (&(fontInfo->font_idx_db),
((XrmBindingList) FontBindings), ((XrmBindingList) FontBindings),
xrmList, _DtHelpXrmQuark, &retValue); xrmList, _DtHelpXrmQuark, &retValue);

1
cde/lib/DtHelp/FontAttr.c
View file

@ -46,6 +46,7 @@
* system includes * system includes
*/ */
#include <string.h> #include <string.h>
#include <stdlib.h>
/* /*
* private includes * private includes

2
cde/lib/DtHelp/FormatCCDF.c
View file

@ -390,7 +390,7 @@ static const FrmtPrivateInfo DefPrivInfo =
(char) False, /* char top_block; */ (char) False, /* char top_block; */
(char) False, /* char dup_flag; */ (char) False, /* char dup_flag; */
0, /* int sdl_type; */ 0, /* int sdl_type; */
NULL, /* void *match_info; */ 0, /* void *match_info; */
NULL, /* void *id_info; */ NULL, /* void *id_info; */
NULL, /* void *tmp_info; */ NULL, /* void *tmp_info; */
}; };

2
cde/lib/DtHelp/GlobSearch.c
View file

@ -5195,7 +5195,7 @@ void _DtHelpGlobSrchInitVars(
srch->curVolRadBtnSens = False; srch->curVolRadBtnSens = False;
srch->volLeftCnt = 0; srch->volLeftCnt = 0;
srch->volListHead = NULL; /* info on search topics found */ srch->volListHead = NULL; /* info on search topics found */
srch->workProcId = NULL; srch->workProcId = 0;
} }

31
cde/lib/DtHelp/Graphics.c
View file

@ -1311,7 +1311,7 @@ static enum _DtGrLoadStatus processBitmap(
int junk; int junk;
unsigned int width, height; unsigned int width, height;
unsigned char *data; unsigned char *data;
Pixmap scaled_pixmap=NULL; Pixmap scaled_pixmap = 0;
Display *dpy = DisplayOfScreen(screen); Display *dpy = DisplayOfScreen(screen);
Drawable drawable = RootWindowOfScreen(screen); Drawable drawable = RootWindowOfScreen(screen);
XImage ximage; XImage ximage;
@ -1404,7 +1404,7 @@ static enum _DtGrLoadStatus processTiff(
) )
{ {
int result = -1; int result = -1;
Pixmap pixmap = NULL; Pixmap pixmap = 0;
ilFile inFile; ilFile inFile;
ilPipe inPipe; ilPipe inPipe;
ilFileImage inImage; ilFileImage inImage;
@ -1507,7 +1507,7 @@ static enum _DtGrLoadStatus processTiff(
if (result == -1) if (result == -1)
{ {
XFreePixmap (dpy, pixmap); XFreePixmap (dpy, pixmap);
pixmap = NULL; pixmap = 0;
} }
} }
} }
@ -1650,7 +1650,8 @@ myXpmReadFileToPixmap(
float ratio float ratio
) )
{ {
XImage *image, **imageptr = NULL; XImage *image = NULL;
XImage **imageptr = 0;
XImage *shapeimage, **shapeimageptr = NULL; XImage *shapeimage, **shapeimageptr = NULL;
int ErrorStatus; int ErrorStatus;
int switchFlag = 0; int switchFlag = 0;
@ -1660,11 +1661,11 @@ myXpmReadFileToPixmap(
*/ */
if (pixmap_return) { if (pixmap_return) {
*pixmap_return = NULL; *pixmap_return = 0;
imageptr = &image; imageptr = &image;
} }
if (shapemask_return) { if (shapemask_return) {
*shapemask_return = NULL; *shapemask_return = 0;
shapeimageptr = &shapeimage; shapeimageptr = &shapeimage;
} }
@ -1795,7 +1796,7 @@ static enum _DtGrLoadStatus processXpm(
int i, j; int i, j;
int result; int result;
short done; short done;
Pixmap pixmap = NULL; Pixmap pixmap = 0;
XpmAttributes xpmAttr; XpmAttributes xpmAttr;
Visual vis2; Visual vis2;
XGCValues gcvalues; XGCValues gcvalues;
@ -1990,7 +1991,7 @@ static enum _DtGrLoadStatus processGIF(
g.f_black, g.f_white, ratio); g.f_black, g.f_white, ratio);
/* Set the returned colors parameters */ /* Set the returned colors parameters */
if (*ret_pixmap != NULL) if (*ret_pixmap != 0)
{ {
if (g.f_do_visual == DO_COLOR) if (g.f_do_visual == DO_COLOR)
{ {
@ -2384,7 +2385,7 @@ _DtHelpProcessGraphic(
unsigned int pixHeight = 0; unsigned int pixHeight = 0;
Dimension pWidth, pHeight; Dimension pWidth, pHeight;
char *ptr; char *ptr;
Pixmap pix = NULL, mask = NULL; Pixmap pix = 0, mask = 0;
_DtGrStream stream; _DtGrStream stream;
Screen *scrptr = ScreenOfDisplay (dpy, screen); Screen *scrptr = ScreenOfDisplay (dpy, screen);
static enum _DtGrColorModel ForceColor = _DtGrCOLOR; static enum _DtGrColorModel ForceColor = _DtGrCOLOR;
@ -2465,7 +2466,7 @@ _DtHelpProcessGraphic(
result = _DtGrOpenFile(&stream, filename); result = _DtGrOpenFile(&stream, filename);
if (result != 0) if (result != 0)
pix = NULL; pix = 0;
else else
{ {
/* Create a pixmap from the image data stream */ /* Create a pixmap from the image data stream */
@ -2481,7 +2482,7 @@ _DtHelpProcessGraphic(
} }
} }
if (pix == NULL) if (pix == 0)
{ {
/* /*
* Try to get a localized pixmap * Try to get a localized pixmap
@ -2489,7 +2490,7 @@ _DtHelpProcessGraphic(
* This is a cached pixmap..... * This is a cached pixmap.....
* Make sure XFreePixmaps does not free this one. * Make sure XFreePixmaps does not free this one.
*/ */
if (*def_pix == NULL) if (*def_pix == 0)
{ {
*def_pix = XmGetPixmap(scrptr, "Dthgraphic", fore_ground, back_ground); *def_pix = XmGetPixmap(scrptr, "Dthgraphic", fore_ground, back_ground);
if (*def_pix != XmUNSPECIFIED_PIXMAP) if (*def_pix != XmUNSPECIFIED_PIXMAP)
@ -2503,16 +2504,16 @@ _DtHelpProcessGraphic(
&pixWidth, &pixHeight, &border, &depth) == 0) &pixWidth, &pixHeight, &border, &depth) == 0)
{ {
XmDestroyPixmap(scrptr, *def_pix); XmDestroyPixmap(scrptr, *def_pix);
*def_pix = NULL; *def_pix = 0;
} }
} }
else else
*def_pix = NULL; *def_pix = 0;
/* /*
* couldn't get a localized pixmap, go with a build in default * couldn't get a localized pixmap, go with a build in default
*/ */
if (*def_pix == NULL) if (*def_pix == 0)
{ {
pixWidth = Missing_bm_width; pixWidth = Missing_bm_width;
pixHeight = Missing_bm_height; pixHeight = Missing_bm_height;

2
cde/lib/DtHelp/HelpDialog.c
View file

@ -3089,7 +3089,7 @@ static void CloseHelpCB (
callDataInfo.locationId = NULL; callDataInfo.locationId = NULL;
callDataInfo.helpVolume = NULL; callDataInfo.helpVolume = NULL;
callDataInfo.specification = NULL; callDataInfo.specification = NULL;
callDataInfo.hyperType = NULL; callDataInfo.hyperType = 0;
/* All we do is envoke the applications close callback */ /* All we do is envoke the applications close callback */

2
cde/lib/DtHelp/HelpQuickD.c
View file

@ -2535,7 +2535,7 @@ static void CloseQuickCB (
callDataInfo.locationId = NULL; callDataInfo.locationId = NULL;
callDataInfo.helpVolume = NULL; callDataInfo.helpVolume = NULL;
callDataInfo.specification = NULL; callDataInfo.specification = NULL;
callDataInfo.hyperType = NULL; callDataInfo.hyperType = 0;
/* All we do is envoke the applications close callback */ /* All we do is envoke the applications close callback */
XtCallCallbackList((Widget)qw,qw->qhelp_dialog.qhelp.closeCallback, XtCallCallbackList((Widget)qw,qw->qhelp_dialog.qhelp.closeCallback,

6
cde/lib/DtHelp/HelpUtil.c
View file

@ -1160,7 +1160,7 @@ static Widget LocateWidgetId(
Widget shellWidget, Widget shellWidget,
Cursor cursorIn) Cursor cursorIn)
{ {
static Cursor DfltOnItemCursor = NULL; static Cursor DfltOnItemCursor = 0;
Widget widget; Widget widget;
Widget child; Widget child;
CompositeWidget comp_widget; CompositeWidget comp_widget;
@ -1179,7 +1179,7 @@ static Widget LocateWidgetId(
/* Make the target cursor */ /* Make the target cursor */
if (cursorIn != NULL) if (cursorIn != 0)
cursor = cursorIn; cursor = cursorIn;
else else
#if 0 #if 0
@ -1187,7 +1187,7 @@ static Widget LocateWidgetId(
#else #else
{ {
_DtHelpProcessLock(); _DtHelpProcessLock();
if (NULL == DfltOnItemCursor) if (0 == DfltOnItemCursor)
{ {
char *bits; char *bits;
char *maskBits; char *maskBits;

2
cde/lib/DtHelp/LayoutUtil.c
View file

@ -169,7 +169,7 @@ CheckList (
*/ */
if (list != NULL) if (list != NULL)
{ {
while (NULL != *list) while ('\0' != *list)
{ {
/* /*
* it matches, return true * it matches, return true

2
cde/lib/DtHelp/XInterface.c
View file

@ -2068,7 +2068,7 @@ _DtHelpDALoadGraphic (
if (fileName != file_xid) if (fileName != file_xid)
free (fileName); free (fileName);
if (pGS->pix == NULL) if (pGS->pix == 0)
{ {
free(pReg); free(pReg);
free(pGS); free(pGS);

4
cde/lib/DtHelp/XUICreate.c
View file

@ -441,8 +441,8 @@ HelpCreateDA(
pDAS->searchColor = DA_args.search_color; pDAS->searchColor = DA_args.search_color;
pDAS->depth = 0; pDAS->depth = 0;
pDAS->spc_chars = NULL; pDAS->spc_chars = NULL;
pDAS->scr_timer_id = NULL; pDAS->scr_timer_id = 0;
pDAS->def_pix = NULL; pDAS->def_pix = 0;
pDAS->context = NULL; pDAS->context = NULL;
pDAS->vertIsMapped = False; pDAS->vertIsMapped = False;
pDAS->horzIsMapped = False; pDAS->horzIsMapped = False;

2
cde/lib/DtHelp/il/ildecompg3.c
View file

@ -454,7 +454,7 @@ ilImageDes *pimdes
dstdata.producerObject = (ilObject) NULL; dstdata.producerObject = (ilObject) NULL;
des = *pimdes; des = *pimdes;
des.compression = IL_UNCOMPRESSED; des.compression = IL_UNCOMPRESSED;
des.compInfo.g4.flags = NULL; des.compInfo.g4.flags = 0;
dstdata.pDes = &des; dstdata.pDes = &des;
dstdata.pFormat = IL_FORMAT_BIT; dstdata.pFormat = IL_FORMAT_BIT;
dstdata.width = pinfo->width; dstdata.width = pinfo->width;

2
cde/lib/DtHelp/il/ildecompg4.c
View file

@ -615,7 +615,7 @@ ilImageDes *pimdes
dstdata.producerObject = (ilObject) NULL; dstdata.producerObject = (ilObject) NULL;
des = *pimdes; des = *pimdes;
des.compression = IL_UNCOMPRESSED; des.compression = IL_UNCOMPRESSED;
des.compInfo.g4.flags = NULL; des.compInfo.g4.flags = 0;
dstdata.pDes = &des; dstdata.pDes = &des;
dstdata.pFormat = IL_FORMAT_BIT; dstdata.pFormat = IL_FORMAT_BIT;
dstdata.width = pinfo->width; dstdata.width = pinfo->width;