debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FreeBSD 10 clang port

Browse Source
This commit is contained in:
Ulrich Wilkens
2014-07-27 16:48:57 +02:00
committed by Jon Trulson
parent 8d0551bfda
commit c3f74eec17
99 changed files with 510 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/lib/DtHelp/il/ilX.c
View File

@@ -914,12 +914,12 @@ int scaledX, scaledY ;
nSrcLines = *pNLines;
if (nSrcLines <= 0)
return; /* no lines, EXIT */
return 0; /* no lines, EXIT */
pPriv = (ilXPrivPtr)pData->pPrivate;
pSrcImage = pData->pSrcImage;
width = pSrcImage->width;
if (width <= 0)
return; /* no width, EXIT */
return 0; /* no width, EXIT */
srcRowBytes = pSrcImage->plane[0].nBytesPerRow;
pSrcLine = (ilPtr)(pSrcImage->plane[0].pPixels +
pData->srcLine * srcRowBytes);

2
cde/lib/DtHelp/il/ilbigray.c
View File

@@ -242,7 +242,7 @@ register int shift, bitNumber;
nLines = *pNLines;
if (nLines <= 0)
return; /* no lines, EXIT */
return 0; /* no lines, EXIT */
if (pPriv->srcBufferHeight)
bottomLine = pPriv->srcBufferHeight - 1;
else bottomLine = pData->srcLine + nLines - 1;

4
cde/lib/DtHelp/il/ilimage.c
View File

@@ -619,11 +619,11 @@ register ilImagePtr pImage;
pImage = (ilImagePtr)image;
if (mustBeZero != 0) {
pImage->o.p.context->error = IL_ERROR_PAR_NOT_ZERO;
return; /* EXIT */
return 0; /* EXIT */
}
if (pImage->o.p.objectType != IL_INTERNAL_IMAGE) {
pImage->o.p.context->error = IL_ERROR_OBJECT_TYPE;
return; /* EXIT */
return 0; /* EXIT */
}
pImage->o.p.context->error = IL_OK;

4
cde/lib/DtHelp/il/ilinvert.c
View File

@@ -106,10 +106,10 @@ register long nLines, nPixels;
dstnbytes = pPriv->dstRowBytes;
pdstline = pPriv->pDstPixels + dstLine * dstnbytes;
if (pPriv->nPixels < 0) return;
if (pPriv->nPixels < 0) return 0;
nLines = *pNLines;
if (nLines <= 0) return;
if (nLines <= 0) return 0;
while ( nLines-- > 0 ) {
psrc = psrcline;

8
cde/lib/DtHelp/il/ilmap.c
View File

@@ -86,11 +86,11 @@ register ilPtr pSrc, pDst, pTranslate;
pPriv = (ilMapPrivPtr)pData->pPrivate;
nRowsM1 = pPriv->width;
if (nRowsM1 <= 0)
return;
return 0;
nRowsM1--;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
srcRowBytes = pPriv->srcRowBytes;
@@ -135,11 +135,11 @@ register ilPtr pSrc, pDst, pTranslate;
pPriv = (ilMapPrivPtr)pData->pPrivate;
nRowsM1 = pPriv->width;
if (nRowsM1 <= 0)
return;
return 0;
nRowsM1--;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
srcRowBytes = pPriv->srcRowBytes;

4
cde/lib/DtHelp/il/ilpalette.c
View File

@@ -159,10 +159,10 @@ register long nLinesM1, nPixelsM1Temp;
nPixelsM1 = pPriv->nPixelsM1;
if (nPixelsM1 < 0)
return;
return 0;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
/* For each src byte: get a long from the cvt'd palette table, then take

4
cde/lib/DtHelp/il/iltruegray.c
View File

@@ -141,10 +141,10 @@ register INT32 i;
dstnbytes = pPriv->dstRowBytes;
pdstline = pPriv->pDstPixels + dstLine * dstnbytes;
if (pPriv->nPixels < 0) return;
if (pPriv->nPixels < 0) return 0;
nLines = *pNLines;
if (nLines <= 0) return;
if (nLines <= 0) return 0;
while ( nLines-- > 0 ) {

12
cde/lib/DtHelp/il/ilycbcr.c
View File

@@ -327,11 +327,11 @@ ilImagePlaneInfo *pPlane;
/* Set nPixels/LinesM1 to # pixels / lines - 1; exit if either 0. */
nPixelsM1Init = pData->pSrcImage->width;
if (nPixelsM1Init <= 0)
return;
return 0;
nPixelsM1Init--;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
/* Point pY/Cb/CrLine to 1st line in src planes; pDstLine to 1st line in dst.
@@ -420,11 +420,11 @@ ilImagePlaneInfo *pPlane;
/* Set nPixels/LinesM1 to # pixels / lines - 1; exit if either 0. */
nPixelsM1Init = pData->pSrcImage->width;
if (nPixelsM1Init <= 0)
return;
return 0;
nPixelsM1Init--;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
/* Point pY/Cb/CrLine to 1st line in src planes; pDstLine to 1st line in dst.
@@ -1161,11 +1161,11 @@ register long R, G, B, pixel;
pPriv = (ilRGBToYCbCrPrivPtr)pData->pPrivate;
nPixelsM1Init = pData->pSrcImage->width;
if (nPixelsM1Init <= 0)
return;
return 0;
nPixelsM1Init--;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
/* Point pSrcLine to first line of src RGB (pixel-order) data; point

4
cde/lib/DtPrint/PrintOptions.c
View File

@@ -460,7 +460,7 @@ _DtPrintGetHdrFtrData(
if (! option) return (void*) NULL;
XtVaGetValues(option, XmNuserData, &info, NULL);
if (info == NULL) return;
if (info == NULL) return 0;
index = _DtPrintGetHdrFtrIndex(option);
return info->specs[index].data;
@@ -484,7 +484,7 @@ _DtPrintGetHdrFtrString(
if (! option) return (void*) NULL;
XtVaGetValues(option, XmNuserData, &info, NULL);
if (info == NULL) return;
if (info == NULL) return 0;
index = _DtPrintGetHdrFtrIndex(option);
return info->specs[index].string;

2
cde/lib/DtTerm/TermPrim/TermPrimBuffer.c
View File

@@ -1025,7 +1025,7 @@ _DtTermPrimBufferInsert
_DtTermPrimBufferInsertWc(tb, row, col, (wchar_t *)newChars,
numChars, insertFlag,
returnChars, returnCount);
return;
return 0;
}
if (WIDTH(line) < col)

2
cde/lib/DtTerm/TermPrim/TermPrimParser.c
View File

@@ -121,7 +121,7 @@ _DtTermPrimParse
if (*parseChar == debugChar) {
ParseTrap();
return;
return 0;
}
}
}

8
cde/lib/csa/Imakefile
View File

@@ -105,12 +105,14 @@ rtable3_clnt.c rtable3_xdr.c: rtable3.h namechange1.sed namechange2.sed
rtable2_clnt.c rtable2_xdr.c: rtable3.h namechange1.sed namechange2.sed
agent_xdr.c agent.c: agent.h
#define RPCGEN rpcgen -h agent.x | $(EXTRASED) \ @@\
$(SED) -f namechange1.sed | \ @@\
$(SED) -f namechange2.sed >> agent.h
agent.h:
$(RM) $@
cat agent.wrapbegin > agent.h
rpcgen -h agent.x | $(EXTRASED) \
sed -f namechange1.sed | \
sed -f namechange2.sed >> agent.h
RPCGEN
cat agent.wrapend >> agent.h
.SUFFIXES: .x

8
cde/lib/tt/mini_isam/isdatconv.c
View File

@@ -140,7 +140,7 @@ ldchar(src, len, dst)
register char *p;
if (len <= 0)
return;
return 0;
/* Load the entire string. */
memcpy((void *) dst, (const void *) src, len);
@@ -165,7 +165,7 @@ stchar(src, dst, len)
register char c;
if (len <= 0)
return;
return 0;
/* Copy up to NULL character. */
do {
@@ -190,7 +190,7 @@ ldchar2(src, len, dst)
register char *p;
if (len <= 0)
return;
return 0;
/* Load the entire string. */
memcpy((void *) dst, (const void *) src, len);
@@ -206,7 +206,7 @@ stchar2(src, dst, len)
register char c;
if (len <= 0)
return;
return 0;
/* Copy up to a NULL character. */
do {

2
cde/lib/tt/mini_isam/isrepair.c
View File

@@ -411,7 +411,7 @@ printkey(n, pkdesc, print)
if (pkdesc->k_nparts == 0) {
print("%3d: --- NO PRIMARY KEY ---\n", n);
return;
return 0;
}
if (n == 1)