dtcm: remove register keyword

diff --git a/cde/programs/dtcm/dtcm/calendarA.c b/cde/programs/dtcm/dtcm/calendarA.c
index e7368991ef92319343dc049702157711db27e416..40a43cea0dfb93116bd86f05ed5c4446283482e8 100644 (file)
--- a/cde/programs/dtcm/dtcm/calendarA.c
+++ b/cde/programs/dtcm/dtcm/calendarA.c
@@ -2474,8 +2474,8 @@ static void
 init_calendar(int argc, char **argv)
 {
        int start, stop;
-       register int i;
-       register char *s_ptr, *d_ptr;
+       int i;
+       char *s_ptr, *d_ptr;
        Props *p;
        Tick today;
        char bind_home[MAXPATHLEN];

diff --git a/cde/programs/dtcm/dtcm/dayglance.c b/cde/programs/dtcm/dtcm/dayglance.c
index 294ff0c7753178fe02fc626ff46b0b8edaa5e1e9..1e5cf9520c4c673744e1863ee5939fe76d86cf02 100644 (file)
--- a/cde/programs/dtcm/dtcm/dayglance.c
+++ b/cde/programs/dtcm/dtcm/dayglance.c
@@ -765,7 +765,7 @@ extern void
 print_day_range(Calendar *c, Tick start_tick, Tick end_tick)
 {
        int             n;
-       register Tick   first_date = start_tick;
+       Tick    first_date = start_tick;
         Boolean        done = False, first = True;
         int            num_page = 1;
        Props           *pr = (Props*)c->properties;

diff --git a/cde/programs/dtcm/dtcm/format.c b/cde/programs/dtcm/dtcm/format.c
index 467354728c13f3a5bd36ed7d6dddafcd08378e1b..47456765641abfe090625e91580da44462364a36 100644 (file)
--- a/cde/programs/dtcm/dtcm/format.c
+++ b/cde/programs/dtcm/dtcm/format.c
@@ -435,7 +435,7 @@ format_appt(Dtcm_appointment *appt, char *b, DisplayType display, int max) {
         int            hr, mn, len, i = 0, j = 0;
        Tick            tick;
        struct tm       *tm;
-       register char           *what_ptr;
+       char            *what_ptr;
        _Xltimeparams localtime_buf;
  
        if (!appt || !b)

diff --git a/cde/programs/dtcm/dtcm/monthglance.c b/cde/programs/dtcm/dtcm/monthglance.c
index cc3134b725a4c7b62c1cdf2db223ce5dc3c246bd..72facdf4ed9dd9d2c712f97b37fdf50b221f8d9f 100644 (file)
--- a/cde/programs/dtcm/dtcm/monthglance.c
+++ b/cde/programs/dtcm/dtcm/monthglance.c
@@ -844,7 +844,7 @@ extern void
 print_month_range(Calendar *c, Tick start_tick, Tick end_tick)
 {
         Props          *p = (Props *)c->properties;
-        register Tick  end, first_date = start_tick;
+        Tick   end, first_date = start_tick;
         int            n;
         Boolean        done = False, first = True;
         int            num_page = 1;

diff --git a/cde/programs/dtcm/dtcm/submit.c b/cde/programs/dtcm/dtcm/submit.c
index 173b0957056ae36738a42b8a5ec29492f780e15f..47627974f6733fc0bdeaff294ea544edf5f1cd5f 100644 (file)
--- a/cde/programs/dtcm/dtcm/submit.c
+++ b/cde/programs/dtcm/dtcm/submit.c
@@ -64,8 +64,8 @@
 static char **
 arpaPhrase(const char * name)
 {
-    register char c;
-    register const char *cp;
+    char c;
+    const char *cp;
     char * cp2;
     int gotlt, lastsp, didq;
     int nesting;

diff --git a/cde/programs/dtcm/dtcm/weekglance.c b/cde/programs/dtcm/dtcm/weekglance.c
index 8fe06bcf642dde403624545f524b473be207bd60..95554a995d7e4f8718c2ffe7370f9f1ba5fe0d0b 100644 (file)
--- a/cde/programs/dtcm/dtcm/weekglance.c
+++ b/cde/programs/dtcm/dtcm/weekglance.c
@@ -291,7 +291,7 @@ print_week_range(Calendar * c, Tick start_tick, Tick end_tick)
 {
 
         Props          *p = (Props *)c->properties;
-        register Tick  first_date = start_tick;
+        Tick   first_date = start_tick;
         int            num_weeks;
         Boolean        done = False, first = True;
         int            num_page = 1;
@@ -793,8 +793,8 @@ resize_weekview(
        Calendar        *c,
        Boundary        *boundary)
 {
-        register int     x, y;
-       register int     n;
+        int     x, y;
+       int      n;
        Week            *w = (Week *)c->view->week_info;
 
        /* allocate weekview storage if it's never been used before */
@@ -829,9 +829,9 @@ static void
 draw_week(Calendar *c, XRectangle *rect, Boundary boundary)
 {
         Week *w = (Week *)c->view->week_info;
-        register int    current_day;
-        register int    n;
-        register int    x, y;
+        int    current_day;
+        int    n;
+        int    x, y;
         int             char_height;
         int             start_date;
         char            **day_names;
@@ -1132,10 +1132,10 @@ fill_day(Calendar *c, Week *w, int x, int y, int day,
 {
        CSA_return_code stat;
        Dtcm_appointment *appt;
-        register int    lower = (int)lowerbound(day);
-        register int    upper = (int)next_ndays(day, 1);
-        register int    i, loop, n;
-        register int    nlines = 0;
+        int    lower = (int)lowerbound(day);
+        int    upper = (int)next_ndays(day, 1);
+        int    i, loop, n;
+        int    nlines = 0;
        XFontSetExtents fontextents;
         int    char_width;
        int     char_height;
@@ -1180,9 +1180,9 @@ fill_day(Calendar *c, Week *w, int x, int y, int day,
 } 
  
 static void
-draw_chart(Calendar *c, register Week *w, XRectangle *rect)
+draw_chart(Calendar *c, Week *w, XRectangle *rect)
 {
-        register int    x, y;
+        int    x, y;
         int     n;
        XFontSetExtents fontextents;
        int     char_height;

diff --git a/cde/programs/dtcm/libDtCmP/cm_tty.c b/cde/programs/dtcm/libDtCmP/cm_tty.c
index 385ef451469933fb545d680301fba6e71a07ea5b..9d574571302abe562832c31181a22cca2a9a1772 100644 (file)
--- a/cde/programs/dtcm/libDtCmP/cm_tty.c
+++ b/cde/programs/dtcm/libDtCmP/cm_tty.c
@@ -168,14 +168,14 @@ extern int _csa_duration_to_iso8601(int, char *);
 **
 *******************************************************************************/
 static void
-copy_and_pad_newlines(register char *dest, register char *source) {
+copy_and_pad_newlines(char *dest, char *source) {
        while (*source)
                if ((*dest++ = *source++) == '\n')
                        *dest++ =  '\t';
 }
 
 static int
-count_newlines(register char *string) {
+count_newlines(char *string) {
        int count = 0;
 
        if (string == NULL)
@@ -1652,10 +1652,10 @@ growcat(char **source, char *new)
 void
 cat_indented_string(char **catbuf, char *string)
 {
-       register char   *p_str = string;
+       char    *p_str = string;
        int             nl_count = 0;
        char            *buf;
-       register char   *b_ptr;
+       char    *b_ptr;
 
        nl_count = count_newlines(string);
 
@@ -2417,7 +2417,7 @@ time_scope_str_i18n(
 extern boolean_t
 valid_time(Props *p, char *time_str) {
        char            *ptr;
-       register int    num_minutes = 0, num_colons = 0;
+       int     num_minutes = 0, num_colons = 0;
        boolean_t       after_colon = B_FALSE;
        DisplayType     dt = get_int_prop(p, CP_DEFAULTDISP);
  

diff --git a/cde/programs/dtcm/libDtCmP/getdate.y b/cde/programs/dtcm/libDtCmP/getdate.y
index 43391d7ab6ed8f12e2291c65618aee6bf74bf339..c25bfbe8d1d4bbd20ace3492a4c37631d6e95139 100644 (file)
--- a/cde/programs/dtcm/libDtCmP/getdate.y
+++ b/cde/programs/dtcm/libDtCmP/getdate.y
@@ -166,7 +166,7 @@ time_t dateconv(int mm,
     int dayflag)
 {
        time_t tod, jdate;
-       register int i;
+       int i;
 
        if (yy < 0) yy = -yy;
 
@@ -203,7 +203,7 @@ time_t dateconv(int mm,
 
 time_t dayconv(int ord, int day, time_t now)
 {
-       register struct tm *loctime;
+       struct tm *loctime;
        time_t tod;
 
        tod = now;
@@ -213,7 +213,7 @@ time_t dayconv(int ord, int day, time_t now)
        return daylcorr(tod, now);
 }
 
-time_t timeconv(register int hh, int mm, int ss, int mer)
+time_t timeconv(int hh, int mm, int ss, int mer)
 {
        if (mm < 0 || mm > 59 || ss < 0 || ss > 59) return (DATE_BMIN);
        switch (mer) {
@@ -410,8 +410,8 @@ lookup(char *id)
 #define getid for(j=idvar, k=id; (*j++ = *k++); )
 
        char idvar[20];
-       register char *j, *k;
-       register struct table *i;
+       char *j, *k;
+       struct table *i;
        int abbrev;
 
        getid;
@@ -468,8 +468,8 @@ int yylex(void)
 {
        extern int yylval;
        int sign;
-       register char c;
-       register char *p;
+       char c;
+       char *p;
        char idbuf[20];
        int pcnt;
 

diff --git a/cde/programs/dtcm/libDtCmP/util.c b/cde/programs/dtcm/libDtCmP/util.c
index 537d1b69837eec5a8670117e486afed4bd3a0616..a0a6593672d66803e7c7cb1b16274cc6613e17a1 100644 (file)
--- a/cde/programs/dtcm/libDtCmP/util.c
+++ b/cde/programs/dtcm/libDtCmP/util.c
@@ -174,7 +174,7 @@ cm_def_printer(void)
  *--------------------------------------------------------------------------*/
 
 extern char *
-cm_strcpy(register char *s1, register char *s2)
+cm_strcpy(char *s1, char *s2)
 {
        if (s1==NULL || s2==NULL) return(NULL);
        strcpy(s1, s2); 
@@ -182,9 +182,9 @@ cm_strcpy(register char *s1, register char *s2)
 }
 
 extern int 
-cm_strlen(register char *s)
+cm_strlen(char *s)
 {
-        register int n;
+        int n;
  
        if (s==NULL) return 0;
        return (strlen(s));
@@ -328,7 +328,7 @@ syserr(char *msg, int a1, int a2, int a3)
 extern char *
 ckalloc(unsigned int size)
 {
-       register char *p;
+       char *p;
 
        /* try to get the memory */
        p = (char *)calloc(1, size);

diff --git a/cde/programs/dtcm/server/lexit.c b/cde/programs/dtcm/server/lexit.c
index 075f264bcd4a3df5ce027ce1612893d84547443f..afd6c6e43cf698a8d8f53af98aa858d7e316a67d 100644 (file)
--- a/cde/programs/dtcm/server/lexit.c
+++ b/cde/programs/dtcm/server/lexit.c
@@ -58,7 +58,7 @@ Appt_Status_4 externApptStatus;
 Tag_4 externTag;
 Privacy_Level_4 externPrivacy;
 
-static int     hash_string     P((register char *));
+static int     hash_string     P((char *));
 static char    *strescapes     P((char *));
 
 static int len;
@@ -274,8 +274,8 @@ yyylex(void)
   }
 
   while(1) {
-    register u_char * ptr = parse_buffer;
-    register u_char c;
+    u_char * ptr = parse_buffer;
+    u_char c;
 
     switch(initial_mask[ *ptr = input_char()]) {
 
@@ -312,8 +312,8 @@ yyylex(void)
 
     case ALPHA:
       {
-       register int bucket;
-       register token_data_t * t;
+       int bucket;
+       token_data_t * t;
 
        while(initial_mask[*(++ptr)=input_char()] == ALPHA)
          ;
@@ -443,10 +443,10 @@ setinput (FILE* f)
 
 
 static int 
-hash_string(register char *s)
+hash_string(char *s)
 {
-  register unsigned result = 0;
-  register int sum;
+  unsigned result = 0;
+  int sum;
   
   while(sum = *s++)
     result = (result << 4) + sum;
@@ -478,7 +478,7 @@ hash_string(register char *s)
 static char * 
 strescapes(char *s)
 {
-  register char * in=s, * out=s;
+  char * in=s, * out=s;
   
   while(*in)
     {
@@ -509,7 +509,7 @@ strescapes(char *s)
            break;
          case '0':  /* a octal constant */
            {
-             register int i,result;
+             int i,result;
              in++;
              for(result=i=0; (i<=3) && (*in >='0') && (*in <= '7') ; )
                {

diff --git a/cde/programs/dtcm/server/list.c b/cde/programs/dtcm/server/list.c
index f8b14a5658dc7a7f74efa162075c22b3067b80d0..bdb13ad40383062da29fbe8236ccd57b4bfc6585 100644 (file)
--- a/cde/programs/dtcm/server/list.c
+++ b/cde/programs/dtcm/server/list.c
@@ -48,8 +48,8 @@ extern        List_node *
 hc_lookup_node (Hc_list        *hc_list, caddr_t key)
 {
        Private         *private;
-       register List_node      *p_node;
-       register _DtCmsComparisonResult result;
+       List_node       *p_node;
+       _DtCmsComparisonResult  result;
 
        p_node = hc_list->root;
        private = (Private *) hc_list->private;
@@ -87,7 +87,7 @@ extern        int
 hc_size (Hc_list *hc_list)
 {
        int             n = 0;
-       register List_node      *p_node;
+       List_node       *p_node;
 
        p_node = hc_list->root;
        while (p_node != NULL)
@@ -145,10 +145,10 @@ hc_destroy(Hc_list *hc_list, Destroy_proc destroy_func)
 }
 
 extern Rb_Status
-hc_insert_node (Hc_list *hc_list, register List_node *p_node, caddr_t key)
+hc_insert_node (Hc_list *hc_list, List_node *p_node, caddr_t key)
 {
        Private *private;
-       register List_node      *p_curr;
+       List_node       *p_curr;
 
        if (hc_list == NULL)
                return (rb_notable);
@@ -229,8 +229,8 @@ hc_delete_node (Hc_list *hc_list, List_node *p_node)
 extern List_node *
 hc_delete (Hc_list *hc_list, caddr_t key)
 {
-       register List_node      *p_node;
-       register Private *private;
+       List_node       *p_node;
+       Private *private;
 
        p_node = hc_list->root;
        private = (Private *) hc_list->private;
@@ -257,8 +257,8 @@ hc_lookup_smallest (Hc_list *hc_list)
 extern caddr_t
 hc_lookup_next_larger (Hc_list *hc_list, caddr_t key)
 {
-       register List_node      *p_node;
-       register Private *private;
+       List_node       *p_node;
+       Private *private;
 
        p_node = hc_list->root;
        private = (Private *) hc_list->private;
@@ -274,7 +274,7 @@ hc_lookup_next_larger (Hc_list *hc_list, caddr_t key)
 extern caddr_t
 hc_lookup_largest (Hc_list *hc_list)
 {
-       register List_node      *p_node;
+       List_node       *p_node;
 
        if ((hc_list == NULL) || (hc_list->root == NULL))
                return (NULL);
@@ -288,8 +288,8 @@ hc_lookup_largest (Hc_list *hc_list)
 extern caddr_t
 hc_lookup_next_smaller (Hc_list *hc_list, caddr_t key)
 {
-       register List_node      *p_node;
-       register Private *private;
+       List_node       *p_node;
+       Private *private;
 
        p_node = hc_list->root;
        private = (Private *) hc_list->private;
@@ -319,7 +319,7 @@ hc_check_list (Hc_list *hc_list)
 extern void
 hc_enumerate_down(Hc_list *hc_list, _DtCmsEnumerateProc doit)
 {
-       register List_node      *p_node;
+       List_node       *p_node;
 
        p_node = hc_list->root;
        while (p_node != NULL)
@@ -333,7 +333,7 @@ hc_enumerate_down(Hc_list *hc_list, _DtCmsEnumerateProc doit)
 extern Rb_Status
 hc_enumerate_up(Hc_list *hc_list, _DtCmsEnumerateProc doit)
 {
-       register List_node      *p_node;
+       List_node       *p_node;
 
        p_node = hc_list->root;
        while (p_node != NULL)

diff --git a/cde/programs/dtcm/server/svcmain.c b/cde/programs/dtcm/server/svcmain.c
index b828ca3c4c9db67cb91ea5582aba3b1e97521f41..c917922c7a3e5fe8089ce743a5cd2175fe4e3dc8 100644 (file)
--- a/cde/programs/dtcm/server/svcmain.c
+++ b/cde/programs/dtcm/server/svcmain.c
@@ -377,7 +377,7 @@ lock_it(void)
 }
 
 static void
-program(struct svc_req *rqstp, register SVCXPRT *transp)
+program(struct svc_req *rqstp, SVCXPRT *transp)
 {
         char *result;
         char *argument = NULL;