1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00

dtappbuilder: remove register keyword

This commit is contained in:
Jon Trulson 2018-06-27 16:08:50 -06:00
parent 3e81f467be
commit f4776c21d7
19 changed files with 73 additions and 73 deletions

View file

@ -506,7 +506,7 @@ draw_select_feedback(
Widget selWidget; Widget selWidget;
Dimension width = 0; Dimension width = 0;
Dimension height = 0; Dimension height = 0;
register int x0,y0,x1,y1; int x0,y0,x1,y1;
int border_w; int border_w;
Display *display; Display *display;
Drawable drawable; Drawable drawable;

View file

@ -720,7 +720,7 @@ connP_get_when_labels(
if (when_label_list == NULL) if (when_label_list == NULL)
{ {
register int i; int i;
when_label_list = (STRING *)XtMalloc( when_label_list = (STRING *)XtMalloc(
sizeof(STRING) * ((int)AB_WHEN_NUM_VALUES - 1)); sizeof(STRING) * ((int)AB_WHEN_NUM_VALUES - 1));
@ -741,7 +741,7 @@ connP_get_act_labels(
if (stdact_label_list == NULL) if (stdact_label_list == NULL)
{ {
register int i; int i;
stdact_label_list = (STRING *)XtMalloc( stdact_label_list = (STRING *)XtMalloc(
sizeof(STRING) * ((int)AB_BUILTIN_ACTION_NUM_VALUES - 1)); sizeof(STRING) * ((int)AB_BUILTIN_ACTION_NUM_VALUES - 1));
@ -923,7 +923,7 @@ connP_make_conn_string(
ABObj action_obj ABObj action_obj
) )
{ {
register int i; int i;
long si; long si;
static char conn_string[BUFSIZ]; static char conn_string[BUFSIZ];
char buf[BUFSIZ]; char buf[BUFSIZ];
@ -1045,7 +1045,7 @@ connP_get_obj_type_index(
int ab_subtype int ab_subtype
) )
{ {
register long i; long i;
if (connP_objtype_needs_subtype(ab_type, ab_subtype)) if (connP_objtype_needs_subtype(ab_type, ab_subtype))
{ {
@ -1268,7 +1268,7 @@ connP_objtype_needs_subtype(
int obj_subtype int obj_subtype
) )
{ {
register int i; int i;
for (i = 0; i < ConnP_num_conn_objs; i++) for (i = 0; i < ConnP_num_conn_objs; i++)
{ {

View file

@ -800,7 +800,7 @@ populate_connection_list(
for (trav_open(&trav, project, AB_TRAV_ACTIONS); for (trav_open(&trav, project, AB_TRAV_ACTIONS);
(obj = trav_next(&trav)) != NULL; ) (obj = trav_next(&trav)) != NULL; )
{ {
register XmString xm_item_str; XmString xm_item_str;
if (is_action_type(obj, ConnP_view_filter)) if (is_action_type(obj, ConnP_view_filter))
{ {
@ -1353,7 +1353,7 @@ get_cur_when(
Widget label_wid = XmOptionButtonGadget(when_menu); Widget label_wid = XmOptionButtonGadget(when_menu);
XmString xm_when_label = (XmString)NULL; XmString xm_when_label = (XmString)NULL;
char *when_label = NULL; char *when_label = NULL;
register int i; int i;
XtVaGetValues(label_wid, XmNlabelString, &xm_when_label, NULL); XtVaGetValues(label_wid, XmNlabelString, &xm_when_label, NULL);
if (xm_when_label != NULL) { if (xm_when_label != NULL) {
@ -1382,7 +1382,7 @@ get_cur_act(
Widget label_wid = XmOptionButtonGadget(action_menu); Widget label_wid = XmOptionButtonGadget(action_menu);
XmString xm_act_label = (XmString)NULL; XmString xm_act_label = (XmString)NULL;
char *act_label = NULL; char *act_label = NULL;
register int i; int i;
XtVaGetValues(label_wid, XmNlabelString, &xm_act_label, NULL); XtVaGetValues(label_wid, XmNlabelString, &xm_act_label, NULL);
if (xm_act_label != NULL) { if (xm_act_label != NULL) {
@ -1408,7 +1408,7 @@ set_cur_when(
AB_WHEN new_when AB_WHEN new_when
) )
{ {
register int i; int i;
for (i = 0; i < ConnP_num_conn_whens; i++) for (i = 0; i < ConnP_num_conn_whens; i++)
{ {
@ -1430,7 +1430,7 @@ set_cur_act(
AB_BUILTIN_ACTION new_act AB_BUILTIN_ACTION new_act
) )
{ {
register int i; int i;
for (i = 0; i < ConnP_num_conn_acts; i++) for (i = 0; i < ConnP_num_conn_acts; i++)
if (new_act == ConnP_conn_acts[i].act_type) if (new_act == ConnP_conn_acts[i].act_type)
@ -3872,7 +3872,7 @@ get_cur_func_type(void)
Widget label_wid = XmOptionButtonGadget(action_type_opmenu); Widget label_wid = XmOptionButtonGadget(action_type_opmenu);
XmString xm_act_label = (XmString)NULL; XmString xm_act_label = (XmString)NULL;
char *act_label = NULL; char *act_label = NULL;
register int i; int i;
AB_FUNC_TYPE func_type = AB_FUNC_UNDEF; AB_FUNC_TYPE func_type = AB_FUNC_UNDEF;
XtVaGetValues(label_wid, XmNlabelString, &xm_act_label, NULL); XtVaGetValues(label_wid, XmNlabelString, &xm_act_label, NULL);

View file

@ -88,10 +88,10 @@ static PalEditableObjInfo *pal_ed_obj_head = NULL;
* which does the trick. * which does the trick.
*/ */
static int static int
strcasecmp(register const char *s1, strcasecmp(const char *s1,
register const char *s2) const char *s2)
{ {
register int c1, c2; int c1, c2;
while (*s1 && *s2) { while (*s1 && *s2) {
c1 = isupper(*s1) ? tolower(*s1) : *s1; c1 = isupper(*s1) ? tolower(*s1) : *s1;

View file

@ -786,7 +786,7 @@ image_copy(
int put_x int put_x
) )
{ {
register int i, j, k, pix; int i, j, k, pix;
Pixel background; Pixel background;
Pixel foreground; Pixel foreground;
Pixel bshadow, tshadow; Pixel bshadow, tshadow;

View file

@ -204,7 +204,7 @@ MsgSet_destroy(
if (that->is_generated && that->msgs != (Msg *)NULL) if (that->is_generated && that->msgs != (Msg *)NULL)
{ {
register int i; int i;
for (i = 0; i < that->num_msgs; i++) for (i = 0; i < that->num_msgs; i++)
msg_destroy(that->msgs[i]); msg_destroy(that->msgs[i]);
@ -257,7 +257,7 @@ MsgSet_just_find_msg(
) )
{ {
int ret_val = -1; int ret_val = -1;
register int i; int i;
if (that == NULL || string == (char *)NULL) if (that == NULL || string == (char *)NULL)
goto cret; goto cret;
@ -317,7 +317,7 @@ MsgSet_set_msg_is_referenced(
BOOL msg_is_referenced BOOL msg_is_referenced
) )
{ {
register int i; int i;
if (that == (MsgSet)NULL) if (that == (MsgSet)NULL)
goto cret; goto cret;
@ -413,7 +413,7 @@ MsgFile_destroy(
if (that->msg_sets != (MsgSet *)NULL) if (that->msg_sets != (MsgSet *)NULL)
{ {
register int i; int i;
for (i = 0; i < that->num_msg_sets; i++) for (i = 0; i < that->num_msg_sets; i++)
MsgSet_destroy(that->msg_sets[i]); MsgSet_destroy(that->msg_sets[i]);
@ -439,7 +439,7 @@ MsgFile_save(
{ {
int ret_val = 0; int ret_val = 0;
FILE *fp = NULL; FILE *fp = NULL;
register int i; int i;
*msgFileOutPtr = NULL; *msgFileOutPtr = NULL;
@ -547,7 +547,7 @@ MsgFile_just_find_msg_set(
) )
{ {
MsgSet ret_val = (MsgSet)NULL; MsgSet ret_val = (MsgSet)NULL;
register int i; int i;
if (that == (MsgFile)NULL) if (that == (MsgFile)NULL)
goto cret; goto cret;
@ -725,7 +725,7 @@ msgFile_get_msg_set_by_num(
) )
{ {
MsgSet ret_val = (MsgSet)NULL; MsgSet ret_val = (MsgSet)NULL;
register int i; int i;
if (that == NULL) if (that == NULL)
goto cret; goto cret;
@ -794,7 +794,7 @@ msgFile_max_set_number(
) )
{ {
int ret_val = 0; int ret_val = 0;
register int i; int i;
if (that == NULL) if (that == NULL)
goto cret; goto cret;
@ -904,7 +904,7 @@ msgSet_output(
) )
{ {
char *set_name; char *set_name;
register int i; int i;
if (that == (MsgSet)NULL) if (that == (MsgSet)NULL)
goto cret; goto cret;
@ -1001,7 +1001,7 @@ msgSet_max_msg_number(
) )
{ {
int ret_val = 0; int ret_val = 0;
register int i; int i;
if (that == NULL) if (that == NULL)
goto cret; goto cret;

View file

@ -270,7 +270,7 @@ abmfP_obj_get_widget_specific_includes(StringList includesList, ABObj obj)
int return_value = 0; int return_value = 0;
int num_includes = 0; int num_includes = 0;
BOOL objHasScrollbar = FALSE; BOOL objHasScrollbar = FALSE;
register IncludeForClass include = class_includes; IncludeForClass include = class_includes;
/* /*
* Get optional widget parts * Get optional widget parts

View file

@ -3168,7 +3168,7 @@ abuilP_store_attr_in_abobj(
AB_OBJECT_TYPE ab_type = obj_get_type(obj); AB_OBJECT_TYPE ab_type = obj_get_type(obj);
unsigned long obj_mask = BMASK(ab_type); unsigned long obj_mask = BMASK(ab_type);
AttrMap *maps = match->attr_maps; AttrMap *maps = match->attr_maps;
register int i; int i;
/* REMIND: fprintf(stderr,"Searching matched maps\n"); */ /* REMIND: fprintf(stderr,"Searching matched maps\n"); */
for (i = 0; i < match->num_maps; i++) for (i = 0; i < match->num_maps; i++)

View file

@ -278,7 +278,7 @@ abuilP_entry_for_uil_widget(
if (b_type > sym_k_error_object) if (b_type > sym_k_error_object)
{ {
register int i; int i;
STRING widget_class_name = uil_widget_names[b_type]; STRING widget_class_name = uil_widget_names[b_type];
for (i = 0; i < XtNumber(widget_abobj_map); i++) for (i = 0; i < XtNumber(widget_abobj_map); i++)

View file

@ -1720,8 +1720,8 @@ BIL_TOKEN
bilP_string_to_token(STRING strToken) bilP_string_to_token(STRING strToken)
{ {
ISTRING istrToken = istr_create(strToken); ISTRING istrToken = istr_create(strToken);
register long midDiff; long midDiff;
register long midIndex; long midIndex;
long minIndex, maxIndex; long minIndex, maxIndex;
bil_token_table_check_init(); bil_token_table_check_init();

View file

@ -120,7 +120,7 @@ AByylex(void)
static int static int
get_token(FILE *file) get_token(FILE *file)
{ {
register int c; /* static for speed */ int c; /* static for speed */
while (TRUE) while (TRUE)
{ {

View file

@ -215,9 +215,9 @@ obj_set_typed_arg_if_new(
ABTypedArg ABTypedArg
obj_get_typed_arg(ABObj obj, char *name) obj_get_typed_arg(ABObj obj, char *name)
{ {
register int num_args; int num_args;
register int i; int i;
register ABTypedArg arg_list= NULL; ABTypedArg arg_list= NULL;
ABTypedArg arg= NULL; ABTypedArg arg= NULL;
ISTRING iname= istr_get_existing(name); ISTRING iname= istr_get_existing(name);
@ -246,9 +246,9 @@ obj_get_typed_arg(ABObj obj, char *name)
ABArg ABArg
obj_get_arg(ABObj obj, char *name) obj_get_arg(ABObj obj, char *name)
{ {
register int num_args; int num_args;
register int i; int i;
register ABArg arg_list; ABArg arg_list;
ABArg arg= NULL; ABArg arg= NULL;
ISTRING iname= istr_get_existing(name); ISTRING iname= istr_get_existing(name);
@ -324,9 +324,9 @@ MergeTypedArgLists(ABTypedArg args1, int num_args1,
int int
obj_remove_arg(ABObj obj, STRING name) obj_remove_arg(ABObj obj, STRING name)
{ {
register int i; int i;
register ABArgList args; ABArgList args;
register int nargs; int nargs;
ISTRING iname= istr_get_existing(name); ISTRING iname= istr_get_existing(name);
if ((obj == NULL) || (obj->args == NULL) ) if ((obj == NULL) || (obj->args == NULL) )
@ -412,8 +412,8 @@ abo_merge_typed_args(ABObj obj, ABTypedArg arg)
int int
obj_get_num_args(ABObj obj) obj_get_num_args(ABObj obj)
{ {
register ABArgList args= obj->args; ABArgList args= obj->args;
register int n = 0; int n = 0;
for ( ; (args != (ABArgList)NULL) && (args->name != NULL); for ( ; (args != (ABArgList)NULL) && (args->name != NULL);
args++, n++) args++, n++)
@ -429,8 +429,8 @@ obj_get_num_args(ABObj obj)
int int
obj_get_num_typed_args(ABObj obj) obj_get_num_typed_args(ABObj obj)
{ {
register ABTypedArg args = obj->typed_args; ABTypedArg args = obj->typed_args;
register int n = 0; int n = 0;
for ( ; (args != NULL) && (args->name != NULL); args++, n++) for ( ; (args != NULL) && (args->name != NULL); args++, n++)
{ {

View file

@ -644,8 +644,8 @@ ab_make_valid_c_ident(STRING label)
static char name[MAXPATHLEN]; static char name[MAXPATHLEN];
static int ith = 0; static int ith = 0;
int lastchar = -1; int lastchar = -1;
register char *oldPtr = label; char *oldPtr = label;
register char *newPtr = name; char *newPtr = name;
if (isdigit(*oldPtr)) if (isdigit(*oldPtr))
{ {

View file

@ -478,8 +478,8 @@ find_first_ancestor_sibling_child(ABObj obj, ABTraversal trav)
static BOOL static BOOL
travP_qualifies(ABTraversal trav) travP_qualifies(ABTraversal trav)
{ {
register ABObj curObj = trav->curObj; ABObj curObj = trav->curObj;
register BOOL qualifies= TRUE; BOOL qualifies= TRUE;
if (obj_has_impl_flags(curObj, ObjFlagDestroyed)) if (obj_has_impl_flags(curObj, ObjFlagDestroyed))
{ {

View file

@ -268,8 +268,8 @@ objxm_get_arg(
char *name char *name
) )
{ {
register int num_args; int num_args;
register int i; int i;
Arg *argptr = NULL; Arg *argptr = NULL;
num_args = objxm_get_num_args(arglist); num_args = objxm_get_num_args(arglist);
@ -422,8 +422,8 @@ objxm_get_num_args(
ArgList arglist ArgList arglist
) )
{ {
register ArgList args = arglist; ArgList args = arglist;
register int n = 0; int n = 0;
for ( ; (args != (ArgList)NULL) && (args->name != NULL); for ( ; (args != (ArgList)NULL) && (args->name != NULL);
args++, n++) args++, n++)
@ -441,9 +441,9 @@ objxm_remove_arg(
STRING name STRING name
) )
{ {
register int i; int i;
register ArgList args; ArgList args;
register int nargs; int nargs;
if (*p_arglist == NULL) if (*p_arglist == NULL)
{ {

View file

@ -1098,10 +1098,10 @@ build_xm_res_table_xmname_index(void)
static ObjxmRes * static ObjxmRes *
find_res_entry_by_xmname(ISTRING istr_xmname) find_res_entry_by_xmname(ISTRING istr_xmname)
{ {
register int midDiff; int midDiff;
register int midIndex; int midIndex;
register int minIndex, maxIndex; int minIndex, maxIndex;
register ObjxmRes *entry; ObjxmRes *entry;
/* /*
* Perform binary search for ISTRING value * Perform binary search for ISTRING value

View file

@ -1859,7 +1859,7 @@ abio_put_string(FILE * outFile, STRING s)
int int
abio_put_string_to_file(FILE * outFile, STRING string) abio_put_string_to_file(FILE * outFile, STRING string)
{ {
register STRING ptr; STRING ptr;
char strEndChar = *(abio_string_end_string()); char strEndChar = *(abio_string_end_string());
char curChar = 0; char curChar = 0;
@ -1971,7 +1971,7 @@ abioP_build_indent_string(
int new_indent_level int new_indent_level
) )
{ {
register int i; int i;
int indent_length = 0; int indent_length = 0;
out_file = out_file; /* avoid warning */ out_file = out_file; /* avoid warning */
@ -2426,7 +2426,7 @@ int
abio_put_string_to_buffer(STRING string, STRING outBuf, int size) abio_put_string_to_buffer(STRING string, STRING outBuf, int size)
{ {
#define INC 32 #define INC 32
register STRING ptr; STRING ptr;
char strEndChar = *(abio_string_end_string()); char strEndChar = *(abio_string_end_string());
char curChar = 0; char curChar = 0;
int i = 0; int i = 0;

View file

@ -275,10 +275,10 @@ util_file_name_is_bil_encapsulated(
static void static void
expand_path(char *nm, char *buf) expand_path(char *nm, char *buf)
{ {
register char *s, *d; char *s, *d;
char lnm[MAXPATHLEN]; char lnm[MAXPATHLEN];
int q; int q;
register char *trimchars = "\n \t"; char *trimchars = "\n \t";
/* Strip off leading & trailing whitespace and cr */ /* Strip off leading & trailing whitespace and cr */
while (strchr(trimchars, *nm) != NULL) while (strchr(trimchars, *nm) != NULL)
@ -303,9 +303,9 @@ expand_path(char *nm, char *buf)
break; break;
} }
else if (*s++ == '$') { else if (*s++ == '$') {
register char *start = d; char *start = d;
register braces = *s == '{'; char braces = *s == '{';
register char *value; char *value;
while (*d++ = *s) while (*d++ = *s)
if (braces ? *s == '}' : !isalnum(*s)) if (braces ? *s == '}' : !isalnum(*s))
break; break;
@ -336,8 +336,8 @@ expand_path(char *nm, char *buf)
} }
else else
{ /* ~user/filename */ { /* ~user/filename */
register char *nnm; char *nnm;
register struct passwd *pw; struct passwd *pw;
for (s = nm; *s && *s != '/'; s++); for (s = nm; *s && *s != '/'; s++);
nnm = *s ? s + 1 : s; nnm = *s ? s + 1 : s;
*s = 0; *s = 0;

View file

@ -861,7 +861,7 @@ hashing(
STRING string STRING string
) )
{ {
register unsigned hash_val = 0; unsigned hash_val = 0;
for (hash_val = 0; *string; ++string) for (hash_val = 0; *string; ++string)
hash_val = hash_val * 65599 + *string; hash_val = hash_val * 65599 + *string;
@ -881,8 +881,8 @@ hash_and_lookupstr(
{ {
#define fast_streq(s1,s2) (((s1)[0] == (s2)[0]) && (strcmp(s1,s2) == 0)) #define fast_streq(s1,s2) (((s1)[0] == (s2)[0]) && (strcmp(s1,s2) == 0))
register unsigned hash_val = 0; unsigned hash_val = 0;
register char *stringPtr; char *stringPtr;
Bucket entry; Bucket entry;
int *valuePtr; int *valuePtr;
int *valuePtrEnd; int *valuePtrEnd;