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

lib/DtHelp: remove register keyword

Browse source
This commit is contained in:
Jon Trulson 2018-06-27 14:19:02 -06:00
parent 2760adaab3
commit 5b5ac72691
15 changed files with 71 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -351,7 +351,7 @@ const char *
_DtHelpCeResolveSpcToAscii ( _DtHelpCeResolveSpcToAscii (
const char *spc_symbol) const char *spc_symbol)
{ {
register int i = 0; int i = 0;
if (NULL == spc_symbol) if (NULL == spc_symbol)
return NULL; return NULL;

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

@ -168,7 +168,7 @@ GetNextState (
char **ret_str_ptr, char **ret_str_ptr,
Boolean *ret_flag ) Boolean *ret_flag )
{ {
register int i = len; int i = len;
/* check to see if we have the pattern of a bold + followed by a bold _ /* check to see if we have the pattern of a bold + followed by a bold _
purpose is to eventually convert this to +/- purpose is to eventually convert this to +/-

12
cde/lib/DtHelp/FormatSDL.c
View file

@ -3297,23 +3297,23 @@ static int MaxSDLElements = sizeof (SdlElementList) / sizeof (SDLElementInfo);
*****************************************************************************/ *****************************************************************************/
#define MyFree(x) if ((char *)(x) != NULL) free(x) #define MyFree(x) if ((char *)(x) != NULL) free(x)
#define SaveRestoreMask(x,y) \ #define SaveRestoreMask(x,y) \
{ register int myI;\ { int myI;\
for (myI = 0; myI < SDL_MASK_LEN; myI++) \ for (myI = 0; myI < SDL_MASK_LEN; myI++) \
x[myI] = y[myI]; \ x[myI] = y[myI]; \
} }
#define MergeMasks(x,y) \ #define MergeMasks(x,y) \
{ register int myI;\ { int myI;\
for (myI = 0; myI < SDL_MASK_LEN; myI++) \ for (myI = 0; myI < SDL_MASK_LEN; myI++) \
x[myI] |= y[myI]; \ x[myI] |= y[myI]; \
} }
#define RemoveMasks(x,y) \ #define RemoveMasks(x,y) \
{ register int myI;\ { int myI;\
for (myI = 0; myI < SDL_MASK_LEN; myI++) \ for (myI = 0; myI < SDL_MASK_LEN; myI++) \
x[myI] &= (~(y[myI])); \ x[myI] &= (~(y[myI])); \
} }
#define MaskToValue(x,y) \ #define MaskToValue(x,y) \
{ register int myI;\ { int myI;\
register SDLMask myMask;\ SDLMask myMask;\
for (myI = 0, y = 0; myI < SDL_MASK_LEN; myI++) \ for (myI = 0, y = 0; myI < SDL_MASK_LEN; myI++) \
if (x[myI] == 0) \ if (x[myI] == 0) \
y += SDL_MASK_SIZE; \ y += SDL_MASK_SIZE; \
@ -3475,7 +3475,7 @@ FreeAttributes(
ElementInfo *cur_info, ElementInfo *cur_info,
_DtHelpFontHints *font_specs) _DtHelpFontHints *font_specs)
{ {
register int i = 0; int i = 0;
const SDLElementAttrList *myList; const SDLElementAttrList *myList;
const SDLAttribute *attrib; const SDLAttribute *attrib;
char *varOffset; char *varOffset;

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

@ -317,7 +317,7 @@ TermStrDraw (
pTerm->lines[y] = (wchar_t *) malloc (sizeof(wchar_t) * (length + 1)); pTerm->lines[y] = (wchar_t *) malloc (sizeof(wchar_t) * (length + 1));
if (pTerm->lines[y] != NULL) if (pTerm->lines[y] != NULL)
{ {
register int i; int i;
wcStr = pTerm->lines[y]; wcStr = pTerm->lines[y];
_DtHelpProcessLock(); _DtHelpProcessLock();
@ -340,7 +340,7 @@ TermStrDraw (
(sizeof(wchar_t) * (length + 1))); (sizeof(wchar_t) * (length + 1)));
if (pTerm->lines[y] != NULL) if (pTerm->lines[y] != NULL)
{ {
register int i; int i;
wcStr = pTerm->lines[y]; wcStr = pTerm->lines[y];
_DtHelpProcessLock(); _DtHelpProcessLock();
for (i = pTerm->wc_num[y]; i < x; i++) for (i = pTerm->wc_num[y]; i < x; i++)
@ -669,7 +669,7 @@ static void
DeallocateHyperArray( DeallocateHyperArray(
DtHelpHyperLines *array_ptr ) DtHelpHyperLines *array_ptr )
{ {
register DtHelpHyperLines *next = array_ptr; DtHelpHyperLines *next = array_ptr;
if (array_ptr) if (array_ptr)
{ {

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

@ -360,7 +360,7 @@ static int
LWZReadByte(byte **inbuf, int flag, int input_code_size, GifState *g) LWZReadByte(byte **inbuf, int flag, int input_code_size, GifState *g)
{ {
int code, incode; int code, incode;
register int i; int i;
if (flag) { if (flag) {
g->set_code_size = input_code_size; g->set_code_size = input_code_size;

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

@ -549,7 +549,7 @@ static void AdjustPositionValues(
NULL != fileList; NULL != fileList;
fileList = _DtHelpFileListGetNext(NULL,fileList) ) fileList = _DtHelpFileListGetNext(NULL,fileList) )
{ {
register _DtHelpGlobSrchVol * vol=(_DtHelpGlobSrchVol *)fileList->clientData; _DtHelpGlobSrchVol * vol=(_DtHelpGlobSrchVol *)fileList->clientData;
if (vol->showVolInList && (vol->hitCnt > 0 || vol->zeroHitsOk) ) if (vol->showVolInList && (vol->hitCnt > 0 || vol->zeroHitsOk) )
break; /* BREAK */ break; /* BREAK */
vol->nextVolPosition += adjNextAmount; vol->nextVolPosition += adjNextAmount;
@ -564,7 +564,7 @@ static void AdjustPositionValues(
NULL != fileList; NULL != fileList;
fileList = _DtHelpFileListGetNext(NULL,fileList) ) fileList = _DtHelpFileListGetNext(NULL,fileList) )
{ {
register _DtHelpGlobSrchVol * vol = (_DtHelpGlobSrchVol *) fileList->clientData; _DtHelpGlobSrchVol * vol = (_DtHelpGlobSrchVol *) fileList->clientData;
if (vol) if (vol)
{ {
vol->startPosition += adjStartAmount; vol->startPosition += adjStartAmount;
@ -888,7 +888,7 @@ static void HitListFree(
_DtHelpGlobSrchVol * vol, _DtHelpGlobSrchVol * vol,
Boolean freeHitsThemselves) Boolean freeHitsThemselves)
{ {
register _DtHelpGlobSrchHit * hit; _DtHelpGlobSrchHit * hit;
if (NULL == vol) return; /* RETURN */ if (NULL == vol) return; /* RETURN */
@ -1129,7 +1129,7 @@ static int HitListAddFound (
NULL != next; NULL != next;
prev = next, next = next->next ) prev = next, next = next->next )
{ {
register int ret; int ret;
/* do a NLS case insensitive compare using NLS collating */ /* do a NLS case insensitive compare using NLS collating */
if ( (ret = (*strcollfn)(next->indexEntry,indexEntry)) >= 0 ) if ( (ret = (*strcollfn)(next->indexEntry,indexEntry)) >= 0 )
@ -1209,7 +1209,7 @@ static int CountSelectedVolumes (
NULL != volListHead; NULL != volListHead;
volListHead = _DtHelpFileListGetNext(NULL, volListHead) ) volListHead = _DtHelpFileListGetNext(NULL, volListHead) )
{ {
register _DtHelpGlobSrchVol * vol; _DtHelpGlobSrchVol * vol;
/* get the volume info */ /* get the volume info */
vol = (_DtHelpGlobSrchVol *) volListHead->clientData; vol = (_DtHelpGlobSrchVol *) volListHead->clientData;
@ -1244,7 +1244,7 @@ static _DtHelpFileEntry GetNextSearchFileAndDisplayCompleted(
NULL != curFile; NULL != curFile;
curFile = _DtHelpFileListGetNext(NULL, curFile) ) curFile = _DtHelpFileListGetNext(NULL, curFile) )
{ {
register _DtHelpGlobSrchVol * vol; _DtHelpGlobSrchVol * vol;
vol = (_DtHelpGlobSrchVol *) curFile->clientData; vol = (_DtHelpGlobSrchVol *) curFile->clientData;
if (NULL == vol) continue; /* CONTINUE */ if (NULL == vol) continue; /* CONTINUE */
@ -2187,7 +2187,7 @@ static void DeleteListContents(
NULL != curFile; NULL != curFile;
curFile = _DtHelpFileListGetNext(NULL,curFile) ) curFile = _DtHelpFileListGetNext(NULL,curFile) )
{ {
register _DtHelpGlobSrchVol * vol = (_DtHelpGlobSrchVol *) curFile->clientData; _DtHelpGlobSrchVol * vol = (_DtHelpGlobSrchVol *) curFile->clientData;
if (NULL == vol) continue; /* CONTINUE */ if (NULL == vol) continue; /* CONTINUE */
/* if any hits are displayed and any have open topics, /* if any hits are displayed and any have open topics,
@ -2195,7 +2195,7 @@ static void DeleteListContents(
if ( vol->hitsDisplayed if ( vol->hitsDisplayed
&& ((vol->nextVolPosition - vol->startPosition) != vol->hitCnt) ) && ((vol->nextVolPosition - vol->startPosition) != vol->hitCnt) )
{ {
register _DtHelpGlobSrchHit * hit; _DtHelpGlobSrchHit * hit;
for ( hit = vol->hitListHead; for ( hit = vol->hitListHead;
NULL != hit; NULL != hit;
hit = hit->next) hit = hit->next)
@ -2375,7 +2375,7 @@ static void ResultsListUpdate(
NULL != testFile; NULL != testFile;
testFile = _DtHelpFileListGetNext(NULL,testFile) ) testFile = _DtHelpFileListGetNext(NULL,testFile) )
{ {
register _DtHelpGlobSrchVol * vol; _DtHelpGlobSrchVol * vol;
vol = (_DtHelpGlobSrchVol *)testFile->clientData; vol = (_DtHelpGlobSrchVol *)testFile->clientData;
if (vol && vol->showVolInList && (vol->hitCnt > 0 || vol->zeroHitsOk)) if (vol && vol->showVolInList && (vol->hitCnt > 0 || vol->zeroHitsOk))
break; /* BREAK */ break; /* BREAK */
@ -2923,7 +2923,7 @@ static void SearchFile(
DtHelpDialogWidget hw, DtHelpDialogWidget hw,
_DtHelpFileEntry file) _DtHelpFileEntry file)
{ {
register _DtHelpGlobSrchVol * vol; _DtHelpGlobSrchVol * vol;
/* get volume info, adding if necessary */ /* get volume info, adding if necessary */
vol = (_DtHelpGlobSrchVol *) file->clientData; vol = (_DtHelpGlobSrchVol *) file->clientData;
@ -3213,7 +3213,7 @@ static void StartSelectedVolumeSearchCB(
NULL != file; NULL != file;
file = _DtHelpFileListGetNext(NULL,file) ) file = _DtHelpFileListGetNext(NULL,file) )
{ {
register _DtHelpGlobSrchVol * vol; _DtHelpGlobSrchVol * vol;
vol = (_DtHelpGlobSrchVol *) file->clientData; vol = (_DtHelpGlobSrchVol *) file->clientData;
if (NULL == vol) continue; if (NULL == vol) continue;

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

@ -322,11 +322,11 @@ static enum _DtGrLoadStatus processXwd(
int *ret_num_colors, int *ret_num_colors,
_DtGrContext *context); _DtGrContext *context);
static void _swaplong ( static void _swaplong (
register char *bp, char *bp,
register unsigned n ); unsigned n );
static void _swapshort ( static void _swapshort (
register char *bp, char *bp,
register unsigned n ); unsigned n );
static int XwdFileToPixmap ( static int XwdFileToPixmap (
Display *dpy, Display *dpy,
int screen, int screen,
@ -471,11 +471,11 @@ static int new_registry_count = 0;
static void static void
_swapshort ( _swapshort (
register char *bp, char *bp,
register unsigned n ) unsigned n )
{ {
register char c; char c;
register char *ep = bp + n; char *ep = bp + n;
while (bp < ep) { while (bp < ep) {
c = *bp; c = *bp;
@ -487,12 +487,12 @@ _swapshort (
static void static void
_swaplong ( _swaplong (
register char *bp, char *bp,
register unsigned n ) unsigned n )
{ {
register char c; char c;
register char *ep = bp + n; char *ep = bp + n;
register char *sp; char *sp;
while (bp < ep) { while (bp < ep) {
sp = bp + 3; sp = bp + 3;
@ -823,8 +823,8 @@ Do_Pseudo(
unsigned long **ret_colors, unsigned long **ret_colors,
int *ret_number ) int *ret_number )
{ {
register int i, x, y, colorCount = 0; int i, x, y, colorCount = 0;
register XColor *color; XColor *color;
int result = 0; int result = 0;
Pixel pixel; Pixel pixel;
@ -921,7 +921,7 @@ Do_Direct(
unsigned long **ret_colors, unsigned long **ret_colors,
int *ret_number ) int *ret_number )
{ {
register int x, y; int x, y;
XColor color; XColor color;
unsigned long rmask, gmask, bmask; unsigned long rmask, gmask, bmask;
int rshift = 0, gshift = 0, bshift = 0; int rshift = 0, gshift = 0, bshift = 0;
@ -1092,9 +1092,9 @@ XwdFileToPixmap (
int *ret_number ) int *ret_number )
{ {
int result; int result;
register int i; int i;
XImage in_image, *out_image; XImage in_image, *out_image;
register char *buffer; char *buffer;
unsigned long swaptest = 1; unsigned long swaptest = 1;
int count; int count;
unsigned buffer_size; unsigned buffer_size;

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

@ -1082,9 +1082,9 @@ static void MenuBarFix(
XmGeoMajorLayout layoutPtr, XmGeoMajorLayout layoutPtr,
XmKidGeometry rowPtr ) XmKidGeometry rowPtr )
{ {
register Dimension marginW ; Dimension marginW ;
register Dimension marginH ; Dimension marginH ;
register Dimension twoMarginW ; Dimension twoMarginW ;
marginW = geoSpec->margin_w ; marginW = geoSpec->margin_w ;
@ -1146,8 +1146,8 @@ XmGeoMatrix _DtHelpDialogWidgetGeoMatrixCreate(
DtHelpDialogWidget hw = (DtHelpDialogWidget) wid ; DtHelpDialogWidget hw = (DtHelpDialogWidget) wid ;
XmGeoMatrix geoSpec ; XmGeoMatrix geoSpec ;
register XmGeoRowLayout layoutPtr ; XmGeoRowLayout layoutPtr ;
register XmKidGeometry boxPtr ; XmKidGeometry boxPtr ;
geoSpec = _XmGeoMatrixAlloc( TB_MAX_WIDGETS_VERT, TB_MAX_NUM_WIDGETS, 0) ; geoSpec = _XmGeoMatrixAlloc( TB_MAX_WIDGETS_VERT, TB_MAX_NUM_WIDGETS, 0) ;
geoSpec->composite = (Widget) hw ; geoSpec->composite = (Widget) hw ;

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

@ -1164,9 +1164,9 @@ static void MenuBarFix(
#endif #endif
XmKidGeometry rowPtr ) XmKidGeometry rowPtr )
{ {
register Dimension marginW ; Dimension marginW ;
register Dimension marginH ; Dimension marginH ;
register Dimension twoMarginW ; Dimension twoMarginW ;
marginW = geoSpec->margin_w ; marginW = geoSpec->margin_w ;
@ -1231,8 +1231,8 @@ SeparatorFix(
XmGeoMajorLayout layoutPtr, /* unused */ XmGeoMajorLayout layoutPtr, /* unused */
XmKidGeometry rowPtr ) XmKidGeometry rowPtr )
{ {
register Dimension marginW ; Dimension marginW ;
register Dimension twoMarginW ; Dimension twoMarginW ;
marginW = geoSpec->margin_w ; marginW = geoSpec->margin_w ;
twoMarginW = (marginW << 1) ; twoMarginW = (marginW << 1) ;
@ -1289,8 +1289,8 @@ XmGeoMatrix _DtHelpQuickDialogWidgetGeoMatrixCreate(
DtHelpQuickDialogWidget qw = (DtHelpQuickDialogWidget) wid ; DtHelpQuickDialogWidget qw = (DtHelpQuickDialogWidget) wid ;
XmGeoMatrix geoSpec ; XmGeoMatrix geoSpec ;
register XmGeoRowLayout layoutPtr ; XmGeoRowLayout layoutPtr ;
register XmKidGeometry boxPtr ; XmKidGeometry boxPtr ;
XmKidGeometry firstButtonBox ; XmKidGeometry firstButtonBox ;
#ifdef NOTDONE #ifdef NOTDONE
int fix_menubar = False ; int fix_menubar = False ;

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

@ -350,9 +350,9 @@ static void copy_pixels(
djpeg_dest_ptr dinfo, djpeg_dest_ptr dinfo,
JDIMENSION rows_supplied) JDIMENSION rows_supplied)
{ {
register int pixval; int pixval;
register JSAMPROW ptr; JSAMPROW ptr;
register JDIMENSION col; JDIMENSION col;
ximg_dest_ptr dest = (ximg_dest_ptr) dinfo; ximg_dest_ptr dest = (ximg_dest_ptr) dinfo;
ptr = dest->pub.buffer[0]; ptr = dest->pub.buffer[0];

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

@ -1680,7 +1680,7 @@ ResolveCell(
int max_rows, int max_rows,
CellInfo *ret_info) CellInfo *ret_info)
{ {
register int i; int i;
char *id; char *id;
char *idRefs; char *idRefs;
char *ptr; char *ptr;
@ -1909,7 +1909,7 @@ ResolveCell(
*/ */
if (retWidth > cellWidth) if (retWidth > cellWidth)
{ {
register int j; int j;
_DtCvUnit cellMax; _DtCvUnit cellMax;
_DtCvUnit maxSlop; _DtCvUnit maxSlop;
_DtCvUnit value; _DtCvUnit value;
@ -2826,7 +2826,7 @@ DetermineMaxDims(
_DtCvUnit *bot_height, _DtCvUnit *bot_height,
_DtCvUnit *max_width) _DtCvUnit *max_width)
{ {
register int j; int j;
_DtCvUnit topWidth; _DtCvUnit topWidth;
_DtCvUnit botWidth; _DtCvUnit botWidth;

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

@ -87,7 +87,7 @@ _DtHelpResizeDisplayArea (
int columns ) int columns )
{ {
int count = 0; int count = 0;
register int n; int n;
unsigned long char_width; unsigned long char_width;
Arg args[5]; Arg args[5];
Dimension newWidth; Dimension newWidth;

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

@ -487,9 +487,9 @@ _DtHelpCeUpperCase ( char *string )
int _DtHelpCeStrHashToKey( int _DtHelpCeStrHashToKey(
const char * str) const char * str)
{ {
register char c; char c;
register const char * tstr; const char * tstr;
register int key = 0; int key = 0;
if (!str) return 0; /* RETURN */ if (!str) return 0; /* RETURN */

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

@ -1820,7 +1820,7 @@ _DtHelpDAResolveSpc (
_DtCvUnit *ret_height, _DtCvUnit *ret_height,
_DtCvUnit *ret_ascent) _DtCvUnit *ret_ascent)
{ {
register int i = 0; int i = 0;
int result = -1; int result = -1;
long fontIdx; long fontIdx;
long spcTbIdx = 0; long spcTbIdx = 0;

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

@ -191,9 +191,9 @@ static int
BufCompressedFill (BufFilePtr f) BufCompressedFill (BufFilePtr f)
{ {
CompressedFile *file; CompressedFile *file;
register char_type *stackp, *de_stack; char_type *stackp, *de_stack;
register char_type finchar; char_type finchar;
register code_int code, oldcode, incode; code_int code, oldcode, incode;
BufChar *buf, *bufend; BufChar *buf, *bufend;
file = (CompressedFile *) f->hidden; file = (CompressedFile *) f->hidden;
@ -286,10 +286,10 @@ static char_type rmask[9] = {0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xf
static code_int static code_int
getcode(CompressedFile *file) getcode(CompressedFile *file)
{ {
register code_int code; code_int code;
register int r_off, bits; int r_off, bits;
register char_type *bp = file->buf; char_type *bp = file->buf;
register BufFilePtr raw; BufFilePtr raw;
if ( file->clear_flg > 0 || file->offset >= file->size || if ( file->clear_flg > 0 || file->offset >= file->size ||
file->free_ent > file->maxcode ) file->free_ent > file->maxcode )