dtmail: remove register keyword

diff --git a/cde/programs/dtmail/dtmail/DmxUtils.C b/cde/programs/dtmail/dtmail/DmxUtils.C
index 9f74027650edadb77082d268c767bfec3e484066..3c25e6d39342eeb6f28ca8a029ef93733f09f399 100644 (file)
--- a/cde/programs/dtmail/dtmail/DmxUtils.C
+++ b/cde/programs/dtmail/dtmail/DmxUtils.C
@@ -169,7 +169,7 @@ static char *phrase(char *, int , int );
 char *
 savestr(char *str)
 {
-       register char *cp, *cp2, *top;
+       char *cp, *cp2, *top;
 
        for (cp = str; *cp; cp++)
                ;
@@ -233,8 +233,8 @@ dispname(const char *hdr)
 static char *
 phrase(char *name, int token, int comma)
 {
-       register char c;
-       register char *cp, *cp2;
+       char c;
+       char *cp, *cp2;
        char *bufend, *nbufp;
        int gotlt, lastsp, didq;
        char nbuf[LINESIZE];

diff --git a/cde/programs/dtmail/dtmail/DtMailGenDialog.C b/cde/programs/dtmail/dtmail/DtMailGenDialog.C
index 134ba15dc7a9ad822bf1c68cfce1530e4caae711..cf46343e530806677bda2a9c06446ae8bf421d82 100644 (file)
--- a/cde/programs/dtmail/dtmail/DtMailGenDialog.C
+++ b/cde/programs/dtmail/dtmail/DtMailGenDialog.C
@@ -308,7 +308,7 @@ void DtMailGenDialog::verify(XmTextVerifyPtr cbs)
 {
     int                 i;
     static char         buffer[MAXPATHLEN];
-    register char       *s, *t;
+    char       *s, *t;
 
 #if defined(SHROUDED_TEXTFIELD_DEBUG)
     printf(

diff --git a/cde/programs/dtmail/dtmail/EncryptedTextFieldUiItem.C b/cde/programs/dtmail/dtmail/EncryptedTextFieldUiItem.C
index c73bf7bb5e4b62244c849ed28efd3c10c138fb59..3ff9c905bc3399a6eb215be4c95ff8dc0100c9f2 100644 (file)
--- a/cde/programs/dtmail/dtmail/EncryptedTextFieldUiItem.C
+++ b/cde/programs/dtmail/dtmail/EncryptedTextFieldUiItem.C
@@ -161,7 +161,7 @@ void EncryptedTextFieldUiItem::verify(XmTextVerifyPtr cbs)
 {
     int                        i;
     static char                buffer[MAXPATHLEN];
-    register char      *s, *t;
+    char       *s, *t;
 
 #if defined(ENCRYPTED_TEXTFIELD_DEBUG)
     printf(

diff --git a/cde/programs/dtmail/dtmail/FindDialog.C b/cde/programs/dtmail/dtmail/FindDialog.C
index cef88a7d549d167ff79a2a3974db1d26fc1c2bfd..2ade10b5a80827cc4ad1470f46e59b60f646ba2d 100644 (file)
--- a/cde/programs/dtmail/dtmail/FindDialog.C
+++ b/cde/programs/dtmail/dtmail/FindDialog.C
@@ -73,7 +73,7 @@
 void
 FindDialog::clear()
 {
-  register unsigned int                offset;
+  unsigned int         offset;
 
   //
   if (_text_labels != NULL) {
@@ -239,7 +239,7 @@ FindDialog::createWorkArea(Widget dialog)
   Widget *label = new Widget[_num_text_fields]; 
 
 
-  register unsigned int                offset;
+  unsigned int         offset;
 
   _name = GETMSG(DT_catd, 1, 192, "Mailer - Find");
 
@@ -364,7 +364,7 @@ FindDialog::createWorkArea(Widget dialog)
   //
 #define TIGHTNESS      20
 
-  register Widget              widget;
+  Widget               widget;
 
   Widget fd_action = XtVaCreateWidget("actionArea",
                                 xmFormWidgetClass,
@@ -500,12 +500,12 @@ FindDialog::findMatching(Boolean findAll)
     //
     // A pointer to the currently interesting message.
     //
-    register DtMailMessageHandle         currentHandle = NULL;
+    DtMailMessageHandle          currentHandle = NULL;
 
     //
     // The offset of the currentHandle in the MsgScrollingList.
     //
-    register int                 handleOffset;
+    int                  handleOffset;
 
     //
     // Find the current message. We would always start from the
@@ -657,7 +657,7 @@ Boolean
 FindDialog::compareMessage(DtMailMessageHandle   handle)
 {
   Boolean                              found = False;
-  register unsigned int                offset;
+  unsigned int         offset;
 
   //
   // Check for something to do.
@@ -740,9 +740,9 @@ FindDialog::strcasestr(const char *str, const char *toFind)
   const char   *result = NULL;         // Default to not found.
 
   if (str && toFind) {         // Sanity check
-    register int       offset = 0;
-    register int       lenToFind = strlen(toFind);
-    register int       lenStr = strlen(str);
+    int        offset = 0;
+    int        lenToFind = strlen(toFind);
+    int        lenStr = strlen(str);
 
     //
     // If toFind == "", then return the entire string (like strstr()).
@@ -771,7 +771,7 @@ FindDialog::compareHeader(DtMailEnv         & error,
                          DtMailValueSeq        & header,
                          const char            * cmpToString)
 {
-  register int         headerOffset = header.length() - 1;
+  int          headerOffset = header.length() - 1;
 
   error.clear();
 
@@ -790,7 +790,7 @@ FindDialog::compareHeader(DtMailEnv         & error,
 void
 FindDialog::getAllFields()
 {
-  register unsigned int                offset;
+  unsigned int         offset;
 
   for (offset = 0; offset < _num_text_fields; offset++) {
     if (_text_fields[offset] != NULL) {
@@ -882,7 +882,7 @@ FindDialog::clearCallback(Widget    /*button*/,
                          XtPointer     /*call_data*/)
 {
   FindDialog   *findData = (FindDialog *)closure;
-  register unsigned int                offset;
+  unsigned int         offset;
 
   for (offset = 0; offset < findData->_num_text_fields; offset++) {
     if (findData->_text_fields[offset] != NULL) {

diff --git a/cde/programs/dtmail/dtmail/MsgScrollingList.C b/cde/programs/dtmail/dtmail/MsgScrollingList.C
index b8b58aac1a83736ce41546c0b1143980ff30072a..a90a7d7bb311f49338ecca4e3384ed55627334f8 100644 (file)
--- a/cde/programs/dtmail/dtmail/MsgScrollingList.C
+++ b/cde/programs/dtmail/dtmail/MsgScrollingList.C
@@ -1496,7 +1496,7 @@ MsgScrollingList::select_all_and_display_last(
 )
  
 {
-    register int                item_pos;
+    int                item_pos;
     int                                num_items;
     MsgHndArray                        * msgHandles = get_messages();
  
@@ -1537,8 +1537,8 @@ MsgScrollingList::select_all_and_display_last(
     unsigned int          elements
 )
 {
-  register int         handleOffset = 0;
-  register int         item_pos;
+  int          handleOffset = 0;
+  int          item_pos;
 
   error.clear();
 

diff --git a/cde/programs/dtmail/dtmail/Sort.C b/cde/programs/dtmail/dtmail/Sort.C
index 8214b4e5fcf68e9f7a0e030f151acdf443bae2eb..8441bbd20bbbdf699b31b5acf2d2ca53145f424a 100644 (file)
--- a/cde/programs/dtmail/dtmail/Sort.C
+++ b/cde/programs/dtmail/dtmail/Sort.C
@@ -114,8 +114,8 @@ Sort::sortMessages(MsgScrollingList *displayList,
 
       messageRecord    * messages = new messageRecord[numberMessages +2];
 
-      register unsigned int    offset;
-      register unsigned int    msgno;
+      unsigned int     offset;
+      unsigned int     msgno;
       DtMail::Message          * msg = NULL;
       DtMail::Envelope * envelope = NULL;
 
@@ -406,11 +406,11 @@ Sort::_msort (char        * base,
              int       (*compar)(char  **one,
                                  char  **two))
 {
-  register int i;
-  register int t;
-  register int s;
-  register int p;
-  register int q;
+  int  i;
+  int  t;
+  int  s;
+  int  p;
+  int  q;
   char *k1;
   char         *k2;
 
@@ -508,8 +508,8 @@ Sort::_sortCmp(char ** one, char ** two)
   //
   // Cast the pointers to the known type.
   //
-  register messageRecord       * first = (messageRecord *) *one;
-  register messageRecord       * second = (messageRecord *) *two;
+  messageRecord        * first = (messageRecord *) *one;
+  messageRecord        * second = (messageRecord *) *two;
 
   if (first->primary_key_str == NULL)
   {

diff --git a/cde/programs/dtmail/dtmailpr/utils.C b/cde/programs/dtmail/dtmailpr/utils.C
index 6eb512701bb412fdd8b7112c988352536e9feb1e..496b2d50746ce8dd6ce1a4d525e1d1d249fec0ba 100644 (file)
--- a/cde/programs/dtmail/dtmailpr/utils.C
+++ b/cde/programs/dtmail/dtmailpr/utils.C
@@ -159,7 +159,7 @@ static char *phrase(char *, int , int );
 char *
 savestr(char *str)
 {
-       register char *cp, *cp2, *top;
+       char *cp, *cp2, *top;
 
        for (cp = str; *cp; cp++)
                ;
@@ -223,8 +223,8 @@ dispname(const char *hdr)
 static char *
 phrase(char *name, int token, int comma)
 {
-       register char c;
-       register char *cp, *cp2;
+       char c;
+       char *cp, *cp2;
        char *bufend, *nbufp;
        int gotlt, lastsp, didq;
        char nbuf[LINESIZE];

diff --git a/cde/programs/dtmail/libDtMail/Common/DtMailRc.C b/cde/programs/dtmail/libDtMail/Common/DtMailRc.C
index 66c1e0a6d9edc32001cc26da5afb4ebd9738658f..a2794c530f9ed11df3e10b64a9513eba15a414f0 100644 (file)
--- a/cde/programs/dtmail/libDtMail/Common/DtMailRc.C
+++ b/cde/programs/dtmail/libDtMail/Common/DtMailRc.C
@@ -458,8 +458,8 @@ DtMail::MailRc::removeValue(DtMailEnv & error,
 // return alternates list
 const char * DtMail::MailRc::getAlternates(DtMailEnv &env)
 {
-    register int    i;
-    register struct hash *h;
+    int    i;
+    struct hash *h;
     struct hash **table = (struct hash **)glob.g_alternates;
     int len;
     
@@ -799,7 +799,7 @@ void DtMail::MailRc::init_globals()
 int
 DtMail::MailRc::load(char *name, char* line)
 {
-    register FILE *in, *oldin;
+    FILE *in, *oldin;
     int ret=0;
     
     if ((in = fopen(name, "r")) == NULL) {
@@ -828,7 +828,7 @@ DtMail::MailRc::load(char *name, char* line)
 int
 DtMail::MailRc::commands(char* iline)
 {
-    register int n;
+    int n;
     char *linebuf = new char[LINESIZE];
     char *line = new char[LINESIZE];
     
@@ -1070,8 +1070,8 @@ int DtMail::MailRc::execute(char linebuf[])
 int
 DtMail::MailRc::readline(FILE *ibuf, char *linebuf)
 {
-    register char *cp;
-    register int c;
+    char *cp;
+    int c;
     int seennulls = 0;
     
     clearerr(ibuf);
@@ -1122,7 +1122,7 @@ void DtMail::MailRc::unstack()
 
 void *DtMail::MailRc::lex(char word[])
 {
-    register struct cmd *cp;
+    struct cmd *cp;
 
     for (cp = &cmdtab[0]; cp->c_name != NOSTR; cp++)
        if (DtMail::MailRc::isprefix(word, cp->c_name))
@@ -1137,7 +1137,7 @@ void *DtMail::MailRc::lex(char word[])
 
 int DtMail::MailRc::isprefix(char *as1, char *as2)
 {
-    register char *s1, *s2;
+    char *s1, *s2;
     
     s1 = as1;
     s2 = as2;
@@ -1154,9 +1154,9 @@ int DtMail::MailRc::isprefix(char *as1, char *as2)
 
 int DtMail::MailRc::getrawlist(char line[], char **argv, int argc)
 {
-    register char **ap, *cp, *cp2;
+    char **ap, *cp, *cp2;
     char linebuf[LINESIZE], quotec;
-    register char **last;
+    char **last;
     
     ap = argv;
     cp = line;
@@ -1212,8 +1212,8 @@ void DtMail::MailRc::freerawlist(char **argv)
 
 char *DtMail::MailRc::mt_value(char name[])
 {
-    register struct var *vp;
-    register char *cp;
+    struct var *vp;
+    char *cp;
 //        extern char *getenv();
     
     if ((vp = lookup(name, (struct var **)this->variables)) == (struct var *)NULL)
@@ -1229,8 +1229,8 @@ char *DtMail::MailRc::mt_value(char name[])
  */
 struct var *DtMail::MailRc::lookup(char *name, struct var **hasharray)
 {
-    register struct var *vp;
-    register int h;
+    struct var *vp;
+    int h;
     
     h = hash(name);
     for (vp = hasharray[h]; vp != (struct var *)NULL; vp = vp->v_link)
@@ -1406,7 +1406,7 @@ DtMail::MailRc::nignorelist(char * key, void * data, void * client_data)
 
 int DtMail::MailRc::set(char **arglist, DtMail::MailRc *)
 {
-    register char *cp, *cp2;
+    char *cp, *cp2;
     char varbuf[LINESIZE], **ap;
     int errs;
     
@@ -1500,7 +1500,7 @@ DtMail::MailRc::wset(const char * verbatim,
 
 int DtMail::MailRc::unset(char **arglist, DtMail::MailRc *)
 {
-        register char **ap;
+        char **ap;
 
         for (ap = arglist; *ap != NOSTR; ap++)
                 (void) MailRc::mt_deassign(*ap);
@@ -1523,8 +1523,8 @@ DtMail::MailRc::wunset(const char * verbatim,
  */
 int DtMail::MailRc::hash(char *name)
 {
-    register unsigned h;
-    register char *cp;
+    unsigned h;
+    char *cp;
     
     for (cp = name, h = 0; *cp; h = (h << 2) + *cp++)
        ;
@@ -1579,8 +1579,8 @@ void DtMail::MailRc::mt_assign(char *name,char * val)
 
 int DtMail::MailRc::mt_deassign(char *s)
 {
-    register struct var *vp, *vp2;
-    register int h;
+    struct var *vp, *vp2;
+    int h;
     
     if ((vp2 = lookup(s, MailRc::variables)) == (struct var *)NULL) {
        return (1);
@@ -1607,8 +1607,8 @@ int DtMail::MailRc::mt_deassign(char *s)
  */
 void DtMail::MailRc::mt_puthash(char *name, char *val, struct var **hasharray)
 {
-    register struct var *vp;
-    register int h;
+    struct var *vp;
+    int h;
     
     vp = lookup(name, hasharray);
     if (vp == (struct var *)NULL) {
@@ -1681,7 +1681,7 @@ void DtMail::MailRc::hm_add(struct hash **table,
                            int size)
 {
     int index;
-    register struct hash *h;
+    struct hash *h;
     
     if (!table)
        return;
@@ -1703,9 +1703,9 @@ void DtMail::MailRc::hm_add(struct hash **table,
 
 void DtMail::MailRc::hm_delete(struct hash **table, char *key)
 {
-    register int index;
-    register struct hash *h;
-    register struct hash *old;
+    int index;
+    struct hash *h;
+    struct hash *old;
     
     if (!table)
        return;
@@ -1733,7 +1733,7 @@ void DtMail::MailRc::hm_delete(struct hash **table, char *key)
 
 void *DtMail::MailRc::hm_test(struct hash **table, char *key)
 {
-    register struct hash *h;
+    struct hash *h;
     
     if (!table)
        return (NULL);
@@ -1754,7 +1754,7 @@ void *DtMail::MailRc::hm_test(struct hash **table, char *key)
 
 void DtMail::MailRc::hm_mark(struct hash **table, char *key)
 {
-    register struct hash *h;
+    struct hash *h;
     
     if (!table)
        return;
@@ -1773,7 +1773,7 @@ void DtMail::MailRc::hm_mark(struct hash **table, char *key)
 
 int DtMail::MailRc::hm_ismarked(struct hash **table, char *key)
 {
-    register struct hash *h;
+    struct hash *h;
     
     if (!table) return 0;
     h = table[hash_index(key)];
@@ -1801,9 +1801,9 @@ DtMail::MailRc::hm_scan(struct hash **table, hm_callback callback, void * client
 
 int DtMail::MailRc::hash_index(char *key)
 {
-    register unsigned h;
-    register char *s;
-    register int c;
+    unsigned h;
+    char *s;
+    int c;
     
     s = key;
     h = 0;
@@ -2004,8 +2004,8 @@ DtMail::MailRc::expand(char *name)
        char *xname = new char[LINESIZE];
        char *cmdbuf = new char[LINESIZE];
        char *str;
-       register int pid, l;
-       register char *cp, *Shell;
+       int pid, l;
+       char *cp, *Shell;
        int s, pivec[2];
        struct stat sbuf;
         char *retchr = NULL;
@@ -2133,7 +2133,7 @@ DtMail::MailRc::wsource(const char * verbatim, char ** arglist, FILE * outf)
 int
 DtMail::MailRc::ifcmd(char **arglist, DtMail::MailRc *self)
 {
-       register char *cp;
+       char *cp;
 
        if (self->cond != CANY) {
                fprintf(stderr,"Illegal nested \"if\"\n");

diff --git a/cde/programs/dtmail/libDtMail/Common/IO.C b/cde/programs/dtmail/libDtMail/Common/IO.C
index bbd3e725f92ce8bf23bff4a710d5fe95639f571c..6847b18fea5365b363200d0b4c85eff007256cc6 100644 (file)
--- a/cde/programs/dtmail/libDtMail/Common/IO.C
+++ b/cde/programs/dtmail/libDtMail/Common/IO.C
@@ -906,7 +906,7 @@ int get_stat(
 struct vmount   **vmountpp)     /* place to tell where buffer is */
 {
   size_t                size;
-  register struct vmount        *vm;
+  struct vmount        *vm;
   int                   nmounts;
   int                   count;
 
@@ -958,7 +958,7 @@ struct vmount *get_vmount(fsid_t *fsid)
 {
     struct vmount *inu_vmount_p=NULL;
     int inu_vmount_num;
-    register struct vmount *vm;
+    struct vmount *vm;
     int nmount;
 
     /* make sure we have all the virtual mount status of this host */

diff --git a/cde/programs/dtmail/libDtMail/Common/str_utils.C b/cde/programs/dtmail/libDtMail/Common/str_utils.C
index 07081d3864a816a84112e3eca67821cf223efcef..86c3e0c3730a1ecb84a8794cb734e1b773296405 100644 (file)
--- a/cde/programs/dtmail/libDtMail/Common/str_utils.C
+++ b/cde/programs/dtmail/libDtMail/Common/str_utils.C
@@ -42,10 +42,10 @@
 
 extern "C" 
 int
-strcasecmp(register const char *s1,
-          register const char *s2)
+strcasecmp(const char *s1,
+          const char *s2)
 {
-    register int c1, c2;
+    int c1, c2;
 
     while (*s1 && *s2) {
        c1 = isupper(*s1) ? tolower(*s1) : *s1;
@@ -61,11 +61,11 @@ strcasecmp(register const char *s1,
 
 extern "C" 
 int
-strncasecmp(register const char *s1,
-           register const char *s2,
-           register size_t count)
+strncasecmp(const char *s1,
+           const char *s2,
+           size_t count)
 {
-    register int c1, c2;
+    int c1, c2;
 
     if (!count)
       return 0;

diff --git a/cde/programs/dtmail/libDtMail/RFC/MIMEPartial.C b/cde/programs/dtmail/libDtMail/RFC/MIMEPartial.C
index c6bbeff5660ae9147e3531d4bcd5c1ba0e54c36f..243b526773890e9d300de871a2898022dd5b5d3d 100644 (file)
--- a/cde/programs/dtmail/libDtMail/RFC/MIMEPartial.C
+++ b/cde/programs/dtmail/libDtMail/RFC/MIMEPartial.C
@@ -86,7 +86,7 @@ getNamedValueInt(const char *string, const char *name)
   int                  stringLen = strlen(string);
   int                  nameLen = strlen(name);
   int                  results = 0;
-  register unsigned int        offset;
+  unsigned int offset;
 
   for (offset = 0; offset < stringLen - nameLen; offset++) {
     if (strncasecmp(&string[offset], name, nameLen) == 0) {
@@ -110,7 +110,7 @@ getNamedValueString(const char *string, const char *name)
   int                    nameLen = strlen(name);
   const char           * results;
   char                 * stringEnd;
-  register unsigned int          offset;
+  unsigned int   offset;
 
   for (offset = 0; offset < stringLen - nameLen; offset++) {
     if (strncasecmp(&string[offset], name, nameLen) == 0) {
@@ -191,7 +191,7 @@ RFCMessage  *
 RFCMailBox::_assemblePartial(DtMailEnv & error,
                             RFCMessage * message)
 {
-  register unsigned int          offset;
+  unsigned int   offset;
   unsigned int           totalParts = 0;
 
   RFCMessage           * msg = message;
@@ -319,7 +319,7 @@ RFCMailBox::_assemblePartial(DtMailEnv      & error,
        unsigned int              duplicateCount;
        int                       fromLen;
        int                       headerNumber = 0;
-       register unsigned int     dupOffset;
+       unsigned int      dupOffset;
 
        if (error.isNotSet()) {
          //

diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C b/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C
index d09e0c69d27e2ff426d2c7be7f6de2b63b7b8c00..0b14d72c4f4c42a8d7f1cd87fc72056f962a3db6 100644 (file)
--- a/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C
+++ b/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C
@@ -524,8 +524,8 @@ skin_comma(char * buf)
 void
 RFCTransport::arpaPhrase(const char * name, DtMailAddressSeq & tokens)
 {
-    register char c;
-    register const char *cp;
+    char c;
+    const char *cp;
     char *cp2;
     char *nbufp;
     char *bufend;