eliminate use of the `register' keyword: let the compiler decide

diff --git a/backup/dump_db.pc b/backup/dump_db.pc
index 2a6231e59a352312206772a35df36047aa8058d3..50066bf490d0e0755e3a72cf24281d321b697832 100644 (file)
--- a/backup/dump_db.pc
+++ b/backup/dump_db.pc
@@ -39,7 +39,7 @@ EXEC SQL END DECLARE SECTION;
 int main(int argc, char **argv)
 {
   char *prefix;
-  register int i;
+  int i;
 
   if (argc != 2)
     {
@@ -68,11 +68,10 @@ int wpunt(void)
   punt("can't write backup file");
 }
 
-int dump_str(register FILE *f, register char *str)
+int dump_str(FILE *f, char *str)
 {
-  register char *ibp;
-  register int c;              /* PCC doesn't put chars in registers.. */
-  register int t;
+  char *ibp, c;
+  int t;
 
   for (ibp = str; c = (unsigned char) *ibp; ibp++)
     {
@@ -133,9 +132,9 @@ FILE *open_file(char *prefix, char *suffix)
 /*
  * Trim whitespace off both ends of a string.
  */
-char *strtrim(register char *save)
+char *strtrim(char *save)
 {
-  register char *t, *s;
+  char *t, *s;
 
   s = save;
   while (isspace(*s))

diff --git a/backup/rest_db.pc b/backup/rest_db.pc
index 1d26fb501c9ba336175f3239a811a4ad4f8e6449..43e7bb11f52bb6124e652bf2b7fae64cf4e4ddde 100644 (file)
--- a/backup/rest_db.pc
+++ b/backup/rest_db.pc
@@ -85,7 +85,7 @@ int yes_or_no(char *prompt)
   int tt = open("/dev/tty", O_RDWR, 0);
   FILE *o, *i;
 
-  register char *cp;
+  char *cp;
 
   if (tt < 0)
     return 0;
@@ -128,11 +128,11 @@ out:
   return ret;
 }
 
-int parse_int(register FILE *f)
+int parse_int(FILE *f)
 {
-  register int c;
-  register int val = 0;
-  register int sign = 1;
+  int c;
+  int val = 0;
+  int sign = 1;
   while ((c = getc(f)) != EOF && c != SEP_CHAR && c != '\n')
     {
       if (c == '-')
@@ -148,9 +148,9 @@ int parse_int(register FILE *f)
   return val * sign;
 }
 
-void parse_str(register FILE *f, register char *buf, register int maxlen)
+void parse_str(FILE *f, char *buf, int maxlen)
 {
-  register int c, len = 0;
+  int c, len = 0;
 
   while ((c = getc(f)) != EOF && c != SEP_CHAR && c != '\n' && len < maxlen)
     {
@@ -160,7 +160,7 @@ void parse_str(register FILE *f, register char *buf, register int maxlen)
          if (isdigit(c))
            {
              /* Expect three-digit octal number.. */
-             register int c1, c2;
+             int c1, c2;
              c1 = getc(f);
              c2 = getc(f);
              if (!isdigit(c1) || !isdigit(c2))

diff --git a/clients/blanche/blanche.c b/clients/blanche/blanche.c
index b2428450f694d0cdd72de9aa525a185722f7f036..be7e60346ef89671886e9cff0bfd6cbc696a2895 100644 (file)
--- a/clients/blanche/blanche.c
+++ b/clients/blanche/blanche.c
@@ -993,9 +993,9 @@ int collect(int argc, char **argv, char ***list)
  * is not found.  ';' is a comment character.
  */
 
-struct member *parse_member(register char *s)
+struct member *parse_member(char *s)
 {
-  register struct member *m;
+  struct member *m;
   char *p, *lastchar;
 
   while (*s && isspace(*s))

diff --git a/clients/moira/attach.c b/clients/moira/attach.c
index d1a7e2e1619c4643aeea349ed05f0182ca2806f8..c2f98168caaa999aec34c83a29efd3750bceb94e 100644 (file)
--- a/clients/moira/attach.c
+++ b/clients/moira/attach.c
@@ -948,7 +948,7 @@ int GetFSAlias(int argc, char **argv)
 
 int CreateFSAlias(int argc, char **argv)
 {
-  register int stat;
+  int stat;
   struct qelem *elem, *top;
   char *args[MAX_ARGS_SIZE], buf[BUFSIZ], **info;
 

diff --git a/clients/moira/cluster.c b/clients/moira/cluster.c
index 9e1132d633555ff9592377b4c383004083020a2e..23dd92d5627c1c5d5d3c9cc33f4ff200d0896ec9 100644 (file)
--- a/clients/moira/cluster.c
+++ b/clients/moira/cluster.c
@@ -828,7 +828,7 @@ int AddMachine(int argc, char **argv)
 
 static void RealUpdateMachine(char **info, Bool junk)
 {
-  register int stat;
+  int stat;
   char **args = AskMCDInfo(info, MACHINE, TRUE);
   if (!args)
     {
@@ -872,7 +872,7 @@ int UpdateMachine(int argc, char **argv)
 
 int CheckAndRemoveFromCluster(char *name, Bool ask_user)
 {
-  register int stat, ret_value;
+  int stat, ret_value;
   Bool delete_it;
   char *args[10], temp_buf[BUFSIZ], *ptr;
   struct qelem *top, *elem = NULL;
@@ -941,7 +941,7 @@ int CheckAndRemoveFromCluster(char *name, Bool ask_user)
 
 static void RealDeleteMachine(char **info, Bool one_machine)
 {
-  register int stat;
+  int stat;
   char temp_buf[BUFSIZ];
 
   sprintf(temp_buf, "Are you sure you want to delete the machine %s (y/n)? ",
@@ -1179,7 +1179,7 @@ int AddMachineToCluster(int argc, char **argv)
 static void RealRemoveMachineFromCluster(char **info, Bool one_map)
 {
   char temp_buf[BUFSIZ];
-  register int stat;
+  int stat;
 
   sprintf(temp_buf, "Remove %s from the cluster %s",
          info[MAP_MACHINE], info[MAP_CLUSTER]);
@@ -1210,7 +1210,7 @@ int RemoveMachineFromCluster(int argc, char **argv)
 {
   struct qelem *elem = NULL;
   char buf[BUFSIZ], * args[10];
-  register int stat;
+  int stat;
 
   args[MAP_MACHINE] = canonicalize_hostname(strsave(argv[1]));
   if (strcasecmp(args[MAP_MACHINE], argv[1]) && *argv[1] != '"')
@@ -1317,7 +1317,7 @@ int AddSubnet(int argc, char **argv)
 
 static void RealUpdateSubnet(char **info, Bool junk)
 {
-  register int stat;
+  int stat;
   char **args = AskMCDInfo(info, SUBNET, TRUE);
   if (!args)
     {
@@ -1357,7 +1357,7 @@ int UpdateSubnet(int argc, char **argv)
 
 static void RealDeleteSubnet(char **info, Bool one_subnet)
 {
-  register int stat;
+  int stat;
   char temp_buf[BUFSIZ];
 
   sprintf(temp_buf,
@@ -1471,7 +1471,7 @@ int AddCluster(int argc, char **argv)
 
 static void RealUpdateCluster(char **info, Bool junk)
 {
-  register int stat;
+  int stat;
   char **args = AskMCDInfo(info, CLUSTER, TRUE);
 
   if (!args)
@@ -1513,7 +1513,7 @@ int UpdateCluster(int argc, char **argv)
 
 int CheckAndRemoveMachines(char *name, Bool ask_first)
 {
-  register int stat, ret_value;
+  int stat, ret_value;
   Bool delete_it;
   char *args[10], temp_buf[BUFSIZ], *ptr;
   struct qelem *top, *elem = NULL;
@@ -1590,7 +1590,7 @@ int CheckAndRemoveMachines(char *name, Bool ask_first)
 
 static void RealDeleteCluster(char **info, Bool one_cluster)
 {
-  register int stat;
+  int stat;
   char temp_buf[BUFSIZ];
 
   sprintf(temp_buf,
@@ -1688,7 +1688,7 @@ int AddClusterData(int argc, char **argv)
 
 static void RealRemoveClusterData(char **info, Bool one_item)
 {
-  register int stat;
+  int stat;
   char *temp_ptr;
 
   Put_message(" ");

diff --git a/clients/moira/delete.c b/clients/moira/delete.c
index a06f2b1fe5de7a03f13c59db81201d48e1cd63e3..43cf6bc811592225a6247158a481ad247797e605 100644 (file)
--- a/clients/moira/delete.c
+++ b/clients/moira/delete.c
@@ -194,7 +194,7 @@ int RemoveItemFromLists(char *name, char *type, struct qelem **elem,
   struct qelem *local;
   char *args[10], temp_buf[BUFSIZ];
   int lists;
-  register int status;
+  int status;
 
   args[0] = type;
   args[1] = name;
@@ -581,7 +581,7 @@ int DeleteList(int argc, char *argv[])
 {
   char buf[BUFSIZ];
   struct qelem *top, *list;
-  register int status;
+  int status;
   Bool one_list;
 
   list = NULL;

diff --git a/clients/moira/lists.c b/clients/moira/lists.c
index 1bd5f7f85f8e435a0d5426cfb367eb2da2d2d3d3..743af7869aca6ff326715fbbff71715569241c94 100644 (file)
--- a/clients/moira/lists.c
+++ b/clients/moira/lists.c
@@ -120,7 +120,7 @@ struct qelem *GetListInfo(int type, char *name1, char *name2)
 {
   char *args[2];
   struct qelem *elem = NULL;
-  register int status;
+  int status;
 
   switch (type)
     {
@@ -276,7 +276,7 @@ int ShowListInfo(int argc, char **argv)
 
 static void RealUpdateList(char **info, Bool junk)
 {
-  register int stat;
+  int stat;
   char **args;
   struct qelem *elem = NULL;
 
@@ -459,7 +459,7 @@ int ListmaintMemberMenuEntry(Menu *m, int argc, char **argv)
 {
   char temp_buf[BUFSIZ];
   char *list_name = argv[1];
-  register int stat;
+  int stat;
 
   if (!ValidName(list_name))
     return DM_QUIT;
@@ -521,7 +521,7 @@ int ListmaintMemberMenuExit(Menu *m)
 int ListMembersByType(char *type)
 {
   char temp_buf[BUFSIZ];
-  register int status;
+  int status;
   char *args[10];
 
   args[0] = current_list;
@@ -639,7 +639,7 @@ int GetMemberInfo(char *action, char **ret_argv)
 int AddMember(void)
 {
   char *args[10], temp_buf[BUFSIZ], *p;
-  register int status;
+  int status;
   struct qelem *mailhubs, *elem, *GetTypeValues();
 
   if (GetMemberInfo("add", args) == SUB_ERROR)
@@ -703,7 +703,7 @@ int AddMember(void)
 int DeleteMember(void)
 {
   char *args[10];
-  register int status;
+  int status;
 
   if (GetMemberInfo("delete", args) == SUB_ERROR)
     return DM_NORMAL;
@@ -734,7 +734,7 @@ int DeleteMember(void)
 
 int InterRemoveItemFromLists(void)
 {
-  register int status;
+  int status;
   char *type, *name, *args[10], buf[BUFSIZ];
   struct qelem *top, *elem;
 
@@ -883,7 +883,7 @@ int ListByAdministrator(void)
 
 int ListAllPublicMailLists(void)
 {
-  register int status;
+  int status;
   static char *args[] = {
     "TRUE",                    /* active */
     "TRUE",                    /* public */

diff --git a/clients/moira/menu.c b/clients/moira/menu.c
index 100ae685123341b71c5fe4cd2e7ea8564eb50011..b905d884478584e46b3166a3f8537670c2a01d45 100644 (file)
--- a/clients/moira/menu.c
+++ b/clients/moira/menu.c
@@ -99,7 +99,7 @@ void menu_com_err_hook(const char *who, long code, const char *fmt,
 int Start_menu(Menu *m)
 {
   struct menu_screen *make_ms();
-  register void (*old_hook)(const char *, long, const char *, va_list) =
+  void (*old_hook)(const char *, long, const char *, va_list) =
     set_com_err_hook((void (*) (const char *, long, const char *, va_list))menu_com_err_hook);
 
   if (initscr() == (WINDOW *)ERR)

diff --git a/clients/moira/nfs.c b/clients/moira/nfs.c
index 98c6b6ff431487e1daefff316d45b8963621b60c..ca99a0d3a460907df921f7daef8d966405719427 100644 (file)
--- a/clients/moira/nfs.c
+++ b/clients/moira/nfs.c
@@ -158,7 +158,7 @@ char **AskNFSInfo(char **info)
 
 int ShowNFSService(int argc, char **argv)
 {
-  register int stat;
+  int stat;
   struct qelem *elem = NULL;
   char *args[10];
 
@@ -245,7 +245,7 @@ int AddNFSService(int argc, char **argv)
 static void RealUpdateNFSService(char **info, Bool junk)
 {
   char **args;
-  register int stat;
+  int stat;
 
   if (!(args = AskNFSInfo(info)))
     {
@@ -266,7 +266,7 @@ static void RealUpdateNFSService(char **info, Bool junk)
 
 int UpdateNFSService(int argc, char **argv)
 {
-  register int stat;
+  int stat;
   struct qelem *elem = NULL;
   char *args[10];
 
@@ -318,7 +318,7 @@ static void RealDeleteNFSService(char **info, Bool one_item)
 {
   char temp_buf[BUFSIZ], *args[10];
   struct qelem *elem = NULL;
-  register int stat;
+  int stat;
 
   sprintf(temp_buf,
          "Are you sure that you want to delete the %s directory on %s",
@@ -368,7 +368,7 @@ static void RealDeleteNFSService(char **info, Bool one_item)
 
 int DeleteNFSService(int argc, char **argv)
 {
-  register int stat;
+  int stat;
   struct qelem *elem = NULL;
   char *args[10];
 

diff --git a/clients/moira/pobox.c b/clients/moira/pobox.c
index 17f49841c8dba960df1ab25586c142b1c291433f..052fe209bd48883a606576767c6076394b46d9c6 100644 (file)
--- a/clients/moira/pobox.c
+++ b/clients/moira/pobox.c
@@ -70,7 +70,7 @@ static void RealPrintPOMachines(char **info)
 
 static int PrintPOMachines(void)
 {
-  register int status;
+  int status;
   static char *args[] = {"pop", NULL};
   struct qelem *top = NULL;
 
@@ -95,7 +95,7 @@ static int PrintPOMachines(void)
 
 int GetUserPOBox(int argc, char **argv)
 {
-  register int status;
+  int status;
   struct qelem *top = NULL;
   char buf[BUFSIZ];
 
@@ -154,7 +154,7 @@ static char *GetNewLocalPOBox(char *local_user)
 
 int SetUserPOBox(int argc, char **argv)
 {
-  register int status;
+  int status;
   char *type, temp_buf[BUFSIZ], *local_user, *args[10], box[BUFSIZ];
   char *temp_box;
   struct qelem *top = NULL;
@@ -267,7 +267,7 @@ int SetUserPOBox(int argc, char **argv)
 
 int RemoveUserPOBox(int argc, char **argv)
 {
-  register int status;
+  int status;
   char temp_buf[BUFSIZ];
 
   if (!ValidName(argv[1]))

diff --git a/clients/moira/quota.c b/clients/moira/quota.c
index a019916c668234f1acd67349fc5c1bbe4ea04f64..c09399a4a4458e97bbbbec126a66b69d9aa4a4a8 100644 (file)
--- a/clients/moira/quota.c
+++ b/clients/moira/quota.c
@@ -49,7 +49,7 @@ static char *def_quota = NULL;
 
 static char *GetDefaultUserQuota(Bool override)
 {
-  register int status;
+  int status;
   char **info;
   struct qelem *top = NULL;
   static char *val[] = {"def_quota", NULL};
@@ -235,7 +235,7 @@ int ShowDefaultQuota(void)
 
 int ChangeDefaultQuota(int argc, char *argv[])
 {
-  register int status;
+  int status;
   char temp_buf[BUFSIZ];
   static char *newval[] = {
     "def_quota", NULL, NULL
@@ -276,7 +276,7 @@ int ChangeDefaultQuota(int argc, char *argv[])
 int GetQuota(void)
 {
   struct qelem *top = NULL;
-  register int status;
+  int status;
   char **args;
 
   if (!(args = GetQuotaArgs(FALSE)))
@@ -306,7 +306,7 @@ int GetQuota(void)
 int GetQuotaByFilesys(void)
 {
   struct qelem *top = NULL;
-  register int status;
+  int status;
   char **args = malloc(2 * sizeof(char *));
 
   if (!args)
@@ -343,7 +343,7 @@ int GetQuotaByFilesys(void)
 int AddQuota(void)
 {
   char **args;
-  register int status;
+  int status;
 
   if (!(args = GetQuotaArgs(TRUE)))
     return DM_NORMAL;
@@ -365,7 +365,7 @@ int AddQuota(void)
 
 static void RealUpdateQuota(char **info)
 {
-  register int status;
+  int status;
   char temp_buf[BUFSIZ];
 
   sprintf(temp_buf, "New quota for filesystem %s (in KB)", info[Q_FILESYS]);
@@ -425,7 +425,7 @@ int UpdateQuota(void)
 
 static void RealDeleteQuota(char **info, Bool one_item)
 {
-  register int status;
+  int status;
   char temp_buf[BUFSIZ];
 
   if (!strcmp(info[Q_TYPE], "ANY"))
@@ -461,7 +461,7 @@ static void RealDeleteQuota(char **info, Bool one_item)
 
 int DeleteQuota(void)
 {
-  register int status;
+  int status;
   char **args;
   struct qelem *top = NULL;
 

diff --git a/clients/moira/user.c b/clients/moira/user.c
index a434210e91145a9767f0724d0c6a386e5cc0c166..e084f0addcff3bb22a5e47a819278c6de8e496d2 100644 (file)
--- a/clients/moira/user.c
+++ b/clients/moira/user.c
@@ -369,7 +369,7 @@ char **AskUserInfo(char **info, Bool name)
 struct qelem *GetUserInfo(int type, char *name1, char *name2)
 {
   char *args[2];
-  register int status;
+  int status;
   struct qelem *elem = NULL;
 
   switch (type)
@@ -437,7 +437,7 @@ struct qelem *GetUserInfo(int type, char *name1, char *name2)
 
 int AddNewUser(void)
 {
-  register int status;
+  int status;
   char **args, *info[MAX_ARGS_SIZE];
 
   if (!(args = AskUserInfo(SetUserDefaults(info), FALSE)))
@@ -509,7 +509,7 @@ static char *ChooseUser(struct qelem *elem)
 static char *GetUidNumberFromName(void)
 {
   char *args[5], *uid, first[BUFSIZ], last[BUFSIZ];
-  register int status;
+  int status;
   struct qelem *top = NULL;
 
   if (!Prompt_input("First Name: ", first, BUFSIZ))
@@ -590,7 +590,7 @@ int RegisterUser(void)
   char *args[MAX_ARGS_SIZE];
   char *login, *fstype = NULL;
   char temp_buf[BUFSIZ];
-  register int status;
+  int status;
 
   Put_message("This function has NO kerberos support, so strange things");
   Put_message("may happen if you use it to register a user.");
@@ -653,7 +653,7 @@ int RegisterUser(void)
 
 static void RealUpdateUser(char **info, Bool junk)
 {
-  register int status;
+  int status;
   char error_buf[BUFSIZ];
   char **args = AskUserInfo(info, TRUE);
 
@@ -697,7 +697,7 @@ int UpdateUser(int argc, char **argv)
 
 static void RealDeactivateUser(char **info, Bool one_item)
 {
-  register int status;
+  int status;
   char txt_buf[BUFSIZ];
   char *qargs[2], **args;
   struct qelem *elem = NULL;

diff --git a/clients/moira/utils.c b/clients/moira/utils.c
index faa90d668b162499e45c2935c7877165009307ba..080593702ab5900a640a194a3964f07bdc0d9057 100644 (file)
--- a/clients/moira/utils.c
+++ b/clients/moira/utils.c
@@ -436,7 +436,7 @@ int NullFunc(void)
 
 void SlipInNewName(char **info, char *name)
 {
-  register int i;
+  int i;
 
   /* This also pushes the NULL down. */
   for (i = CountArgs(info); i > 0; i--)
@@ -588,7 +588,7 @@ int GetFSTypes(char **current, int options)
 
 char *Strsave(char *str)
 {
-  register char *newstr = malloc(strlen(str) + 1);
+  char *newstr = malloc(strlen(str) + 1);
 
   if (!newstr)
     return NULL;
@@ -621,7 +621,7 @@ char *atot(char *itime)
 int Print(int argc, char **argv, char *callback)
 {
   char buf[BUFSIZ];
-  register int i;
+  int i;
 
   found_some = TRUE;
   strcpy(buf, argv[0]);        /* no newline 'cause Put_message adds one */
@@ -659,7 +659,7 @@ int PrintByType(int argc, char **argv, char *callback)
 
 int PrintHelp(char **message)
 {
-  register int i;
+  int i;
 
   for (i = 0; i < CountArgs(message); i++)
     Put_message(message[i]);

diff --git a/clients/userreg/disable.c b/clients/userreg/disable.c
index c7761a89d1908d092b9bae30c1a410dcac5818f8..2fa13a8520a596b4efb3d27202b36211710d69dc 100644 (file)
--- a/clients/userreg/disable.c
+++ b/clients/userreg/disable.c
@@ -36,7 +36,7 @@ char  *listend;
 unsigned listsize;
 
 char *cmp();
-int number(register char c, FILE *f);
+int number(char c, FILE *f);
 
 /* This routine will determine if registration is enabled at this time.  If
  * NULL is returned, registration is OK.  Otherwise, the string returned
@@ -45,7 +45,7 @@ int number(register char c, FILE *f);
 
 char *disabled(char **msg)
 {
-  register char *cp;
+  char *cp;
   int hit;
 
   *msg = 0;
@@ -110,7 +110,7 @@ char *disabled(char **msg)
 
 char *cmp(char *p, int v)
 {
-  register char *cp;
+  char *cp;
 
   cp = p;
   switch (*cp++)
@@ -163,10 +163,10 @@ init(void)
 
 append(char *fn)
 {
-  register int i, c;
-  register char *cp;
-  register char *ocp;
-  register int n;
+  int i, c;
+  char *cp;
+  char *ocp;
+  int n;
   FILE *f, *fopen();
 
   if (!(f = fopen(fn, "r")))
@@ -263,9 +263,9 @@ ignore:
   goto loop;
 }
 
-int number(register char c, FILE *f)
+int number(char c, FILE *f)
 {
-  register int n = 0;
+  int n = 0;
 
   while (isdigit(c))
     {

diff --git a/clients/userreg/reg_stubs.c b/clients/userreg/reg_stubs.c
index b5eaae96ae28a1919c011255d3e2d51a7f9727c0..ff9bc2160a98d82d4e3351af7007b560fcf83eb2 100644 (file)
--- a/clients/userreg/reg_stubs.c
+++ b/clients/userreg/reg_stubs.c
@@ -109,8 +109,8 @@ int verify_user(char *first, char *last, char *idnumber,
   int call = ntohl((u_long)UREG_VERIFY_USER);
   des_cblock key;
   des_key_schedule ks;
-  register char *bp = buf;
-  register int len;
+  char *bp = buf;
+  int len;
   char crypt_src[1024];
 
   memcpy(bp, &version, sizeof(int));
@@ -151,8 +151,8 @@ int do_operation(char *first, char *last, char *idnumber, char *hashidnumber,
   int call = ntohl(opcode);
   des_cblock key;
   des_key_schedule ks;
-  register char *bp = buf;
-  register int len;
+  char *bp = buf;
+  int len;
 
   char crypt_src[1024];
   char *cbp;

diff --git a/clients/userreg/userreg.c b/clients/userreg/userreg.c
index 8a9cb19941b7cf033ef8c192124148d98c85f25c..c66840529d4f5798d04e6af0cc72f7b19c0f601f 100644 (file)
--- a/clients/userreg/userreg.c
+++ b/clients/userreg/userreg.c
@@ -66,8 +66,8 @@ fix_display(sig)
 
 int main(int argc, char **argv)
 {
-  register int ntimes;
-  register int reencrypt;
+  int ntimes;
+  int reencrypt;
   char line[100], *when, *msg;
   int status;
   char tmpfirst[100], tmplast[100], tmpmid[100];
@@ -259,7 +259,7 @@ int dolook(void)
   /* do the database lookup */
 
   char line[100];
-  register int result;
+  int result;
 
   if (user_is_valid)
     {
@@ -675,9 +675,9 @@ glogin(void)
 gmitid(void)
 {
   /* get mid id */
-  register int i;
+  int i;
   char buf[15];
-  register char *nbuf = buf;
+  char *nbuf = buf;
   struct sigaction act;
 
 input_mit_id:
@@ -798,7 +798,7 @@ int kinit(char *user, char *passwd)
 #define _toupper(c) ((c) & ~0x20)
 #endif
 
-int lenient_strcmp(register char *string1, register char *string2)
+int lenient_strcmp(char *string1, char *string2)
 {
   /*
    * a primitive case insensitive string comparison. It returns only 0
@@ -864,9 +864,9 @@ restart(void)
   longjmp(redo, 1);
 }
 
-canon_name(register char *cp)
+canon_name(char *cp)
 {
-  register char *p2 = cp;
+  char *p2 = cp;
 
   /* Trim whitespace off both ends. */
   for (; *p2 && isspace(*p2); p2++)

diff --git a/dbck/members.pc b/dbck/members.pc
index 924e4d0d18deaff60836bd5bee7245a1f3b8ae69..2cfdf027a4a99e5de21c6352156063d79ef117af 100644 (file)
--- a/dbck/members.pc
+++ b/dbck/members.pc
@@ -344,7 +344,7 @@ fix_members()
 insert_list(m)
 struct member *m;
 {
-    register struct member_list *l, *l1;
+    struct member_list *l, *l1;
 
     l = (struct member_list *) hash_lookup(lists, m->list_id);
     if (l == NULL) {
@@ -385,7 +385,7 @@ struct member *m;
 insert_member(m)
 struct member *m;
 {
-    register struct member_list *l, *l1;
+    struct member_list *l, *l1;
 
     l = (struct member_list *) hash_lookup(members, m->member_id);
     if (l == NULL) {
@@ -428,7 +428,7 @@ struct member *find_member(listid, memberid)
 int listid;
 int memberid;
 {
-    register struct member_list *l;
+    struct member_list *l;
 
     for (l = (struct member_list *) hash_lookup(lists, listid); l; l = l->next)
       if (l->member->member_id == memberid)
@@ -448,7 +448,7 @@ int *errmis;
     char *mtype;
     EXEC SQL END DECLARE SECTION; 
     char buf[2];
-    register struct member *m;
+    struct member *m;
 
     for (; l; l = l->next) {
        m = l->member;
@@ -523,7 +523,7 @@ int *errmis;
 
 struct member *allocmember()
 {
-    register struct member *m;
+    struct member *m;
 
     m = (struct member *) malloc(sizeof(struct member));
     if (m == NULL) {
@@ -538,7 +538,7 @@ struct member *allocmember()
 
 int isinchain(m, l)
 struct member *m;
-register struct member_list *l;
+struct member_list *l;
 {
     for (; l; l = l->next)
       if (l->member == m)
@@ -548,9 +548,9 @@ register struct member_list *l;
 
 
 int chainlen(l)
-register struct member_list *l;
+struct member_list *l;
 {
-    register int i;
+    int i;
     for (i = 0; l; l = l->next, i++);
     return(i);
 }

diff --git a/dbck/nhash.c b/dbck/nhash.c
index 40cd1ccf8bfe5523225660fbf6b7b88d869761c8..d81dd0855db2d8e8308f036f38dd12292506caab 100644 (file)
--- a/dbck/nhash.c
+++ b/dbck/nhash.c
@@ -48,9 +48,9 @@ struct int_hash *create_int_hash(int size)
  * the key, or NULL (thus NULL is not a very good value to store...)
  */
 
-int int_hash_lookup(struct int_hash *h, register int key)
+int int_hash_lookup(struct int_hash *h, int key)
 {
-  register struct int_bucket *b;
+  struct int_bucket *b;
 
   b = h->data[int_hash_func(h, key)];
   while (b && b->key != key)
@@ -66,9 +66,9 @@ int int_hash_lookup(struct int_hash *h, register int key)
  * existed, or 0 if not.
  */
 
-int int_hash_update(struct int_hash *h, register int key, int value)
+int int_hash_update(struct int_hash *h, int key, int value)
 {
-  register struct int_bucket *b;
+  struct int_bucket *b;
 
   b = h->data[int_hash_func(h, key)];
   while (b && b->key != key)
@@ -87,9 +87,9 @@ int int_hash_update(struct int_hash *h, register int key, int value)
  * previously there, 1 if it was, or -1 if we ran out of memory.
  */
 
-int int_hash_store(struct int_hash *h, register int key, int value)
+int int_hash_store(struct int_hash *h, int key, int value)
 {
-  register struct int_bucket *b, **p;
+  struct int_bucket *b, **p;
 
   p = &(h->data[int_hash_func(h, key)]);
   if (!*p)
@@ -124,9 +124,9 @@ int int_hash_store(struct int_hash *h, register int key, int value)
  * data with that value, call the callback proc with the corresponding key.
  */
 
-int int_hash_search(struct int_hash *h, register int value, void (*callback)())
+int int_hash_search(struct int_hash *h, int value, void (*callback)())
 {
-  register struct int_bucket *b, **p;
+  struct int_bucket *b, **p;
 
   for (p = &(h->data[h->size - 1]); p >= h->data; p--)
     {
@@ -144,7 +144,7 @@ int int_hash_search(struct int_hash *h, register int value, void (*callback)())
 
 int int_hash_step(struct int_hash *h, void (*callback)(), char *hint)
 {
-  register struct int_bucket *b, **p;
+  struct int_bucket *b, **p;
 
   for (p = &(h->data[h->size - 1]); p >= h->data; p--)
     {
@@ -158,7 +158,7 @@ int int_hash_step(struct int_hash *h, void (*callback)(), char *hint)
 
 int int_hash_destroy(struct int_hash *h)
 {
-  register struct int_bucket *b, **p, *b1;
+  struct int_bucket *b, **p, *b1;
 
   for (p = &(h->data[h->size - 1]); p >= h->data; p--)
     {

diff --git a/dbck/phase2.pc b/dbck/phase2.pc
index 3af9a269b17b0d5d242f203744b788d3c46cd637..4c92ccc7d5706d75a768a9d714db0b4d3e11439e 100644 (file)
--- a/dbck/phase2.pc
+++ b/dbck/phase2.pc
@@ -871,7 +871,7 @@ fsmatch(int id, struct nfsphys *n, struct filesys *f)
 }
 
 
-check_fs(int id, register struct filesys *f, int hint)
+check_fs(int id, struct filesys *f, int hint)
 {
   EXEC SQL BEGIN DECLARE SECTION;
   int iid = id, id1, id2, id3, rowcount;

diff --git a/dbck/phase3.pc b/dbck/phase3.pc
index 2f7a27b9f9ad7d1c9aaae9fc77bbc01c2eaf607f..e78421bd0f16f21cd1b323f500a36e255fab739e 100644 (file)
--- a/dbck/phase3.pc
+++ b/dbck/phase3.pc
@@ -26,7 +26,7 @@ empty_list_check(int id, struct list *l, int hint)
 
 struct string *string_check(int id)
 {
-  register struct string *s;
+  struct string *s;
 
   s = (struct string *) hash_lookup(strings, id);
   if (!s)

diff --git a/gen/hesiod.pc b/gen/hesiod.pc
index 410c114db8ef82cc06e51079a97242ffddf654b5..7a71639db045e3927cc07fa0d9b7d24f9e40c5c8 100644 (file)
--- a/gen/hesiod.pc
+++ b/gen/hesiod.pc
@@ -250,7 +250,7 @@ int do_groups(void)
   FILE *iout, *gout, *lout;
   char ioutf[64], goutf[64], loutf[64], buf[2048], *l;
   struct hash *groups;
-  register struct bucket *b, **p;
+  struct bucket *b, **p;
   struct grp *g;
   struct user *u;
   struct stat isb, gsb, lsb;
@@ -431,7 +431,7 @@ int do_filsys(void)
 {
   FILE *out;
   char outf[64], outft[64], *mach, *group;
-  register char *p;
+  char *p;
   struct stat sb;
   time_t ftime;
   struct save_queue *sq, *sq2, *sq_create();

diff --git a/gen/mailhub.pc b/gen/mailhub.pc
index ff9aa63e9a8475fec1575e49b63ed0702b913e0d..4247f8dbe32c6c87b24705ef53b2e2cadac310e0 100644 (file)
--- a/gen/mailhub.pc
+++ b/gen/mailhub.pc
@@ -138,9 +138,9 @@ get_info(void)
   char name[129], type[9], fname[17], mname[17], lname[17], buf[257];
   EXEC SQL END DECLARE SECTION;
   char *s;
-  register struct user *u;
+  struct user *u;
   struct list *l, *memberlist;
-  register struct member *m;
+  struct member *m;
 
   /* The following is declarative, not executed,
    * and so is dependent on where it is in the file,
@@ -332,8 +332,8 @@ sqlerr:
 
 save_mlist(int id, struct list *l, int force)
 {
-  register struct member *m;
-  register struct list *l1;
+  struct member *m;
+  struct list *l1;
 
   if (l->maillist > 1 || (l->maillist == 0 && !force))
     return;
@@ -387,7 +387,7 @@ int incount = 0;
 insert_name(char *s, int id, int nodups, int copy)
 {
   int code;
-  register struct names *ns;
+  struct names *ns;
 
   incount++;
   code = hashstr(s);
@@ -471,16 +471,16 @@ static int illegalchars[] = {
 
 /* While hashing the string, punt any illegal characters */
 
-int hashstr(register char *s)
+int hashstr(char *s)
 {
-  register int result;
-  register int c;
+  int result;
+  int c;
 
   for (result = 0; c = *s; s++)
     {
       if (illegalchars[c])
        {
-         register char *p;
+         char *p;
          for (p = s; *p; p++)
            *p = p[1];
          continue;
@@ -508,8 +508,8 @@ sort_info(void)
 
 output_data(int dummy, struct names *nms, FILE *out)
 {
-  register struct names *ns;
-  register struct user *u;
+  struct names *ns;
+  struct user *u;
 
   incount++;
   for (ns = nms; ns; ns = ns->next)
@@ -535,11 +535,11 @@ output_data(int dummy, struct names *nms, FILE *out)
 
 int lwid, bol, awid;
 
-output_mlist(int id, register struct list *l)
+output_mlist(int id, struct list *l)
 {
   struct list *l1;
-  register struct member *m;
-  register struct user *u;
+  struct member *m;
+  struct user *u;
 
   put_fill(out, l->description);
   if (l->acl_t ==  'L' && (l1 = (struct list *) hash_lookup(lists, l->acl_id)))
@@ -563,9 +563,9 @@ output_mlist(int id, register struct list *l)
 
 /* print out strings separated by commas, doing line breaks as appropriate */
 
-do_member(FILE *out, register char *s)
+do_member(FILE *out, char *s)
 {
-  register wwid;
+  wwid;
   static int cont = 1;
   char str[8];
 
@@ -604,11 +604,11 @@ do_member(FILE *out, register char *s)
 }
 
 
-put_fill(FILE *aliases, register char *string)
+put_fill(FILE *aliases, char *string)
 {
-  register char *c;
-  register int lwid;
-  register int wwid;
+  char *c;
+  int lwid;
+  int wwid;
 
   if (!string || !*string)
     return;
@@ -671,7 +671,7 @@ char *perm_malloc(unsigned size)
 {
   static char *pool = NULL;
   static unsigned pool_size = 0;
-  register char *ret;
+  char *ret;
 
   if (size > pool_size)
     {
@@ -691,8 +691,8 @@ char *perm_malloc(unsigned size)
  */
 char *pstrsave(char *s)
 {
-  register int len;
-  register char *p;
+  int len;
+  char *p;
   /* Kludge for sloppy string semantics */
   if (!s)
     {
@@ -731,9 +731,9 @@ struct hash *create_hash(int size)
  * the key, or NULL (thus NULL is not a very good value to store...)
  */
 
-char *hash_lookup(struct hash *h, register int key)
+char *hash_lookup(struct hash *h, int key)
 {
-  register struct bucket *b;
+  struct bucket *b;
 
   b = h->data[hash_func(h, key)];
   while (b && b->key != key)
@@ -749,9 +749,9 @@ char *hash_lookup(struct hash *h, register int key)
  * existed, or 0 if not.
  */
 
-int hash_update(struct hash *h, register int key, char *value)
+int hash_update(struct hash *h, int key, char *value)
 {
-  register struct bucket *b;
+  struct bucket *b;
 
   b = h->data[hash_func(h, key)];
   while (b && b->key != key)
@@ -770,9 +770,9 @@ int hash_update(struct hash *h, register int key, char *value)
  * there, 1 if it was, or -1 if we ran out of memory.
  */
 
-int hash_store(struct hash *h, register int key, char *value)
+int hash_store(struct hash *h, int key, char *value)
 {
-  register struct bucket *b, **p;
+  struct bucket *b, **p;
 
   p = &(h->data[hash_func(h, key)]);
   if (!*p)
@@ -807,9 +807,9 @@ int hash_store(struct hash *h, register int key, char *value)
  * data with that value, call the callback proc with the corresponding key.
  */
 
-hash_search(struct hash *h, register char *value, void (*callback)())
+hash_search(struct hash *h, char *value, void (*callback)())
 {
-  register struct bucket *b, **p;
+  struct bucket *b, **p;
 
   for (p = &(h->data[h->size - 1]); p >= h->data; p--)
     {
@@ -827,7 +827,7 @@ hash_search(struct hash *h, register char *value, void (*callback)())
 
 hash_step(struct hash *h, void (*callback)(), char *hint)
 {
-  register struct bucket *b, **p;
+  struct bucket *b, **p;
 
   for (p = &(h->data[h->size - 1]); p >= h->data; p--)
     {

diff --git a/gen/setquota.c b/gen/setquota.c
index eb045ca27cc5b8b98d193be3f38ff400f2e078c6..5bcf8100cb6c35deb73ee0533611165f4da17081 100644 (file)
--- a/gen/setquota.c
+++ b/gen/setquota.c
@@ -153,7 +153,7 @@ int main(int argc, char **argv)
 
 get_device(char *device_or_dir)
 {
-  register struct mntent *mntp;
+  struct mntent *mntp;
   FILE *fstab;
 
   fstab = setmntent(MNTTAB, "r");

diff --git a/gen/util.c b/gen/util.c
index 2640b2ca58bbcbd06c55aeb3512c38803021c35e..320ccef6361bb9d4791bf1963dac8638b1463a4c 100644 (file)
--- a/gen/util.c
+++ b/gen/util.c
@@ -45,7 +45,7 @@ fix_file(char *targetfile)
 }
 
 
-char *dequote(register char *s)
+char *dequote(char *s)
 {
   char *last = s;
 

diff --git a/incremental/afs.c b/incremental/afs.c
index f9ea3313bd9d43525d986569079e053900a07cd5..23941deceeb8d90f79d9957ecba6fff00e8f6bc3 100644 (file)
--- a/incremental/afs.c
+++ b/incremental/afs.c
@@ -233,7 +233,7 @@ do_user(char **before, int beforec, char **after, int afterc)
 
 do_list(char **before, int beforec, char **after, int afterc)
 {
-  register int agid, bgid;
+  int agid, bgid;
   int ahide, bhide;
   long code, id;
   char g1[PR_MAXNAMELEN], g2[PR_MAXNAMELEN];
@@ -632,8 +632,8 @@ long pr_try(long (*fn)(), char *a1, char *a2, char *a3, char *a4, char *a5,
            char *a6, char *a7, char *a8)
 {
   static int initd = 0;
-  register long code;
-  register int tries = 0;
+  long code;
+  int tries = 0;
 
   check_afs();
 

diff --git a/incremental/ksrvtgt.c b/incremental/ksrvtgt.c
index 5053eeab8e889bf496e3f4160baa59c321dc314a..1be6e3e21424cbebc00e7a953a0c56ccdef2fc35 100644 (file)
--- a/incremental/ksrvtgt.c
+++ b/incremental/ksrvtgt.c
@@ -34,7 +34,7 @@ void usage(char **argv)
 int main(int argc, char **argv)
 {
   char realm[REALM_SZ + 1];
-  register int code;
+  int code;
   int i, lifetime = 1;
   char srvtab[MAXPATHLEN + 1];
 

diff --git a/lib/fixhost.c b/lib/fixhost.c
index 989d7c848a705c9decd74312c3d7b13aad7f0928..11e087d5a0ee5d6c20a3ef557ceb4ffd3c610ee4 100644 (file)
--- a/lib/fixhost.c
+++ b/lib/fixhost.c
@@ -37,12 +37,12 @@ static char *rcsid_fixhost_c = "$Header$";
 
 char *canonicalize_hostname(char *host)
 {
-  register struct hostent *hp;
+  struct hostent *hp;
   int n_len;
   int has_dot = 0;
   char tbuf[BUFSIZ];
   struct utsname name;
-  register char *cp;
+  char *cp;
 
   if (strlen(host) > 2 && host[0] == '"' && host[strlen(host) - 1] == '"')
     {
@@ -70,7 +70,7 @@ char *canonicalize_hostname(char *host)
       /* can't get name from nameserver; fix up the format a bit */
       for (cp = host; *cp; cp++)
        {
-         register int c;       /* pcc doesn't like register char */
+         int c;
          if (islower(c = *cp))
            *cp = toupper(c);
          has_dot |= (c == '.');

diff --git a/lib/fixname.c b/lib/fixname.c
index 0ce5730c7a397f48fbb120a9ea393cfc5078d6de..02e9d254146ff2b33012956fad567c7ac09377df 100644 (file)
--- a/lib/fixname.c
+++ b/lib/fixname.c
@@ -50,10 +50,10 @@ void FixName(char *ilnm, char *ifnm, char *last, char *first, char *middle)
   strncpy(first, ifnm, FIRST_LEN);
 }
 
-FixCase(register char *p)
+FixCase(char *p)
 {
-  register int cflag;  /* convert to lcase, unless at start or following */
-                       /* a space or punctuation mark (e.g., '-') */
+  int cflag;   /* convert to lcase, unless at start or following */
+               /* a space or punctuation mark (e.g., '-') */
 
   for (cflag = 0; *p; p++)
     {
@@ -68,11 +68,10 @@ FixCase(register char *p)
     }
 }
 
-LookForJrAndIII(register char *nm, register int *pends_jr, int *pends_ii,
-               register int *pends_iii, register int *pends_iv,
-               int *pends_v)
+LookForJrAndIII(char *nm, int *pends_jr, int *pends_ii, int *pends_iii,
+               int *pends_iv, int *pends_v)
 {
-  register int len = strlen(nm);
+  int len = strlen(nm);
 
   if (len >= 4 && !strcmp(nm + len - 3, " JR"))
     {
@@ -106,7 +105,7 @@ LookForJrAndIII(register char *nm, register int *pends_jr, int *pends_ii,
     }
 }
 
-LookForSt(register char *nm)           /* ST PIERRE, etc. */
+LookForSt(char *nm)            /* ST PIERRE, etc. */
 {
   char temp[256];
 
@@ -118,20 +117,20 @@ LookForSt(register char *nm)              /* ST PIERRE, etc. */
     }
 }
 
-LookForO(register char *nm)            /* O BRIEN, etc. */
+LookForO(char *nm)             /* O BRIEN, etc. */
 {
   if (!strcmp(nm, "O ") && isalpha(nm[2]))
     nm[1] = '\'';
 }
 
-TrimTrailingSpace(register char *ip)
+TrimTrailingSpace(char *ip)
 {
-  register char *p;
+  char *p;
   for (p = ip + strlen(ip) - 1; p >= ip && isspace(*p); p--)
     *p = '\0';
 }
 
-GetMidInit(register char *nm, register char *mi)
+GetMidInit(char *nm, char *mi)
 {
   while (*nm && !isspace(*nm))
     nm++;

diff --git a/lib/hash.c b/lib/hash.c
index 214eae4caad54b1348bad1828f0ca1912cf0d424..e00be3149711fce1fba4aea3f934a5491d84d1a4 100644 (file)
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -42,9 +42,9 @@ struct hash *create_hash(int size)
  * the key, or NULL (thus NULL is not a very good value to store...)
  */
 
-char *hash_lookup(struct hash *h, register int key)
+char *hash_lookup(struct hash *h, int key)
 {
-  register struct bucket *b;
+  struct bucket *b;
 
   b = h->data[hash_func(h, key)];
   while (b && b->key != key)
@@ -60,9 +60,9 @@ char *hash_lookup(struct hash *h, register int key)
  * existed, or 0 if not.
  */
 
-int hash_update(struct hash *h, register int key, char *value)
+int hash_update(struct hash *h, int key, char *value)
 {
-  register struct bucket *b;
+  struct bucket *b;
 
   b = h->data[hash_func(h, key)];
   while (b && b->key != key)
@@ -81,9 +81,9 @@ int hash_update(struct hash *h, register int key, char *value)
  * there, 1 if it was, or -1 if we ran out of memory.
  */
 
-int hash_store(struct hash *h, register int key, char *value)
+int hash_store(struct hash *h, int key, char *value)
 {
-  register struct bucket *b, **p;
+  struct bucket *b, **p;
 
   p = &(h->data[hash_func(h, key)]);
   if (!*p)
@@ -118,9 +118,9 @@ int hash_store(struct hash *h, register int key, char *value)
  * data with that value, call the callback proc with the corresponding key.
  */
 
-hash_search(struct hash *h, register char *value, void (*callback)())
+hash_search(struct hash *h, char *value, void (*callback)())
 {
-  register struct bucket *b, **p;
+  struct bucket *b, **p;
 
   for (p = &(h->data[h->size - 1]); p >= h->data; p--)
     {
@@ -138,7 +138,7 @@ hash_search(struct hash *h, register char *value, void (*callback)())
 
 hash_step(struct hash *h, void (*callback)(), char *hint)
 {
-  register struct bucket *b, **p;
+  struct bucket *b, **p;
 
   for (p = &(h->data[h->size - 1]); p >= h->data; p--)
     {
@@ -152,7 +152,7 @@ hash_step(struct hash *h, void (*callback)(), char *hint)
 
 hash_destroy(struct hash *h)
 {
-  register struct bucket *b, **p, *b1;
+  struct bucket *b, **p, *b1;
 
   for (p = &(h->data[h->size - 1]); p >= h->data; p--)
     {

diff --git a/lib/mr_access.c b/lib/mr_access.c
index 5c13d9ccb5220f021590e551babdefcb2629c3e5..c4a44ed76f3f5e31c9c00d00f61f963c6398c4c5 100644 (file)
--- a/lib/mr_access.c
+++ b/lib/mr_access.c
@@ -22,8 +22,8 @@ static char *rcsid_sms_access_c = "$Header$";
  */
 int mr_access(char *name, int argc, char **argv)
 {
-  register char **nargv = malloc(sizeof(char *) * (argc + 1));
-  register int status = 0;
+  char **nargv = malloc(sizeof(char *) * (argc + 1));
+  int status = 0;
 
   nargv[0] = name;
   memcpy(nargv + 1, argv, sizeof(char *) * argc);
@@ -40,7 +40,7 @@ int mr_access_internal(int argc, char **argv)
 {
   int status;
   mr_params params_st;
-  register mr_params *params = NULL;
+  mr_params *params = NULL;
   mr_params *reply = NULL;
 
   CHECK_CONNECTED;

diff --git a/lib/mr_auth.c b/lib/mr_auth.c
index 5136111527224921d211eb7a9721730941f3fd95..133f58057f0a329cae2fbbca7ae4a3aeb58e79dc 100644 (file)
--- a/lib/mr_auth.c
+++ b/lib/mr_auth.c
@@ -28,13 +28,13 @@ static char *rcsid_sms_auth_c = "$Header$";
 
 int mr_auth(char *prog)
 {
-  register int status;
+  int status;
   mr_params params_st;
   char *args[2];
   int argl[2];
   char realm[REALM_SZ], host[BUFSIZ], *p;
 
-  register mr_params *params = &params_st;
+  mr_params *params = &params_st;
   mr_params *reply = NULL;
   KTEXT_ST auth;
 

diff --git a/lib/mr_connect.c b/lib/mr_connect.c
index 4da24acc8483d96e520b788d4738837e7edfb4cc..6ff90b6a7c28b072a5ed1fa8f63fb2428c96bea8 100644 (file)
--- a/lib/mr_connect.c
+++ b/lib/mr_connect.c
@@ -69,7 +69,7 @@ int mr_connect(char *server)
     return errno;
   if (connection_status(_mr_conn) == CON_STOPPED)
     {
-      register status = connection_errno(_mr_conn);
+      int status = connection_errno(_mr_conn);
       if (!status)
        status = MR_CANT_CONNECT;
       mr_disconnect();

diff --git a/lib/mr_param.c b/lib/mr_param.c
index b061254768099507b0d15a3bcf816475cef8d9d5..3da07f6a7bc1d4b7410809082be1963aa5088cf1 100644 (file)
--- a/lib/mr_param.c
+++ b/lib/mr_param.c
@@ -40,7 +40,7 @@ int mr_cont_send(OPERATION op, HALF_CONNECTION hcon, struct mr_params *arg)
 }
 
 int mr_start_send(OPERATION op, HALF_CONNECTION hcon,
-                 register struct mr_params *arg)
+                 struct mr_params *arg)
 {
   int i, len;
   unsigned int mr_size;
@@ -129,7 +129,7 @@ int mr_cont_recv(OPERATION op, HALF_CONNECTION hcon, mr_params **argp)
   char *cp;
   int *ip;
   int i;
-  register mr_params *arg = *argp;
+  mr_params *arg = *argp;
 
   while (!done)
     {
@@ -200,7 +200,7 @@ int mr_cont_recv(OPERATION op, HALF_CONNECTION hcon, mr_params **argp)
 
 int mr_start_recv(OPERATION op, HALF_CONNECTION hcon, struct mr_params **argp)
 {
-  register mr_params *arg = *argp;
+  mr_params *arg = *argp;
   if (!arg)
     {
       *argp = arg = malloc(sizeof(mr_params));

diff --git a/lib/mr_query.c b/lib/mr_query.c
index 3e74d14d50e942c524e39b01eb289b42416c381c..26763a3c0b3100bde51a0582e6c34ab622e9364a 100644 (file)
--- a/lib/mr_query.c
+++ b/lib/mr_query.c
@@ -29,8 +29,8 @@ static int level = 0;
 int mr_query(char *name, int argc, char **argv,
             int (*callproc)(), char *callarg)
 {
-  register char **nargv = malloc(sizeof(char *) * (argc + 1));
-  register int status = 0;
+  char **nargv = malloc(sizeof(char *) * (argc + 1));
+  int status = 0;
 
   nargv[0] = name;
   memcpy(nargv + 1, argv, sizeof(char *) * argc);
@@ -56,7 +56,7 @@ int mr_query_internal(int argc, char **argv, int (*callproc)(), char *callarg)
 {
   int status;
   mr_params params_st;
-  register mr_params *params = NULL;
+  mr_params *params = NULL;
   mr_params *reply = NULL;
   int stopcallbacks = 0;
 

diff --git a/lib/nfsparttype.c b/lib/nfsparttype.c
index c9782d1f201590658b4ef19f79bace16ae5cc0eb..2aec68f2a21bcb6a65699206fc00e622e4f37e33 100644 (file)
--- a/lib/nfsparttype.c
+++ b/lib/nfsparttype.c
@@ -49,7 +49,7 @@ static struct pair fs_names[] = {
 char *format_filesys_type(char *fs_status)
 {
   char buf[BUFSIZ];
-  register struct pair *pp;
+  struct pair *pp;
 
   int n_names = 0;
   int stat = atoi(fs_status);
@@ -87,8 +87,8 @@ char *format_filesys_type(char *fs_status)
  */
 char *parse_filesys_type(char *fs_type_name)
 {
-  register struct pair *pp;
-  register char *cp = fs_type_name;
+  struct pair *pp;
+  char *cp = fs_type_name;
   char temp[BUFSIZ];
   int flags = 0;
 

diff --git a/lib/sq.c b/lib/sq.c
index 406f0b593a08b1efbf62b00d43d1d58a222ffba6..68f0d207698aa45cc7699aeba6f151c81e3c6fef 100644 (file)
--- a/lib/sq.c
+++ b/lib/sq.c
@@ -14,7 +14,7 @@
 
 struct save_queue *sq_create(void)
 {
-  register struct save_queue *sq;
+  struct save_queue *sq;
 
   sq = malloc(sizeof(struct save_queue));
   if (!sq)
@@ -25,9 +25,9 @@ struct save_queue *sq_create(void)
   return sq;
 }
 
-int sq_save_data(register struct save_queue *sq, char *data)
+int sq_save_data(struct save_queue *sq, char *data)
 {
-  register struct save_queue *q;
+  struct save_queue *q;
 
   q = malloc(sizeof(struct save_queue));
   if (!q)
@@ -40,12 +40,10 @@ int sq_save_data(register struct save_queue *sq, char *data)
   return 1;
 }
 
-int sq_save_args(register int argc, register char *argv[],
-                register struct save_queue *sq)
+int sq_save_args(int argc, char *argv[], struct save_queue *sq)
 {
-  register char **argv_copy;
-  register int i;
-  register int n;
+  char **argv_copy;
+  int i, n;
 
   argv_copy = malloc(argc * sizeof(char *));
   if (!argv_copy)
@@ -67,9 +65,9 @@ int sq_save_args(register int argc, register char *argv[],
   return sq_save_data(sq, (char *)argv_copy);
 }
 
-int sq_save_unique_data(register struct save_queue *sq, char *data)
+int sq_save_unique_data(struct save_queue *sq, char *data)
 {
-  register struct save_queue *q;
+  struct save_queue *q;
 
   for (q = sq->q_next; q != sq; q = q->q_next)
     {
@@ -80,9 +78,9 @@ int sq_save_unique_data(register struct save_queue *sq, char *data)
   return sq_save_data(sq, data);
 }
 
-int sq_save_unique_string(register struct save_queue *sq, char *data)
+int sq_save_unique_string(struct save_queue *sq, char *data)
 {
-  register struct save_queue *q;
+  struct save_queue *q;
 
   for (q = sq->q_next; q != sq; q = q->q_next)
     {
@@ -93,7 +91,7 @@ int sq_save_unique_string(register struct save_queue *sq, char *data)
   return sq_save_data(sq, data);
 }
 
-int sq_get_data(register struct save_queue *sq, register char **data)
+int sq_get_data(struct save_queue *sq, char **data)
 {
   if (sq->q_lastget == (struct save_queue *)0)
     sq->q_lastget = sq->q_next;
@@ -106,7 +104,7 @@ int sq_get_data(register struct save_queue *sq, register char **data)
   return 1;
 }
 
-int sq_remove_data(register struct save_queue *sq, register char **data)
+int sq_remove_data(struct save_queue *sq, char **data)
 {
   if (sq->q_next != sq)
     {
@@ -119,7 +117,7 @@ int sq_remove_data(register struct save_queue *sq, register char **data)
   return 0;
 }
 
-int sq_empty(register struct save_queue *sq)
+int sq_empty(struct save_queue *sq)
 {
   if (sq->q_next == sq)
     return 1;
@@ -127,9 +125,9 @@ int sq_empty(register struct save_queue *sq)
     return 0;
 }
 
-sq_destroy(register struct save_queue *sq)
+sq_destroy(struct save_queue *sq)
 {
-  register struct save_queue *q;
+  struct save_queue *q;
 
   for (q = sq->q_next; q != sq; q = sq->q_next)
     {

diff --git a/lib/strs.c b/lib/strs.c
index c0b7cd4c49756e08e538010b202520ef5e216e9d..1dc4def69778f3efc6579c3911d70539d68feb5f 100644 (file)
--- a/lib/strs.c
+++ b/lib/strs.c
@@ -29,8 +29,8 @@ static char *rcsid_strs_c = "$Header$";
  */
 char *strsave(char *s)
 {
-  register int len;
-  register char *p;
+  int len;
+  char *p;
   /* Kludge for sloppy string semantics */
   if (!s)
     {
@@ -48,9 +48,9 @@ char *strsave(char *s)
 /*
  * Trim whitespace off both ends of a string.
  */
-char *strtrim(register char *save)
+char *strtrim(char *save)
 {
-  register char *t, *s;
+  char *t, *s;
 
   s = save;
   while (isspace(*s))
@@ -83,7 +83,7 @@ char *strtrim(register char *save)
 
 char *uppercase(char *s)
 {
-  register char *p;
+  char *p;
 
   for (p = s; *p; p++)
     {
@@ -96,7 +96,7 @@ char *uppercase(char *s)
 
 char *lowercase(char *s)
 {
-  register char *p;
+  char *p;
 
   for (p = s; *p; p++)
     {

diff --git a/reg_svr/reg_svr.c b/reg_svr/reg_svr.c
index 27bbce4b55dad2c88999aabac98062d5d90fdb8e..807660d32c9b0fc79c5519b4cfab229f6b34af21 100644 (file)
--- a/reg_svr/reg_svr.c
+++ b/reg_svr/reg_svr.c
@@ -534,7 +534,7 @@ int reserve_user(struct msg *message, char *retval)
   int status = SUCCESS;                /* General purpose error status */
   char fstype_buf[7];          /* Buffer to hold fs_type, a 16 bit number */
   char *login;                 /* The login name the user wants */
-  register int i;              /* A counter */
+  int i;                       /* A counter */
 
   /* Log that we are about to reserve a user. */
   com_err(whoami, 0, "reserving user %s %s", message->first, message->last);
@@ -733,7 +733,7 @@ int set_identity(struct msg *message, char *retval)
   int status = SUCCESS;                /* General purpose error status */
   char fstype_buf[7];          /* Buffer to hold fs_type, a 16 bit number */
   char *login;                 /* The login name the user wants */
-  register int i;              /* A counter */
+  int i;                       /* A counter */
 
   /* Log that we are about to reserve a user. */
   com_err(whoami, 0, "setting identity %s %s",

diff --git a/reg_svr/requests.c b/reg_svr/requests.c
index 8b859d387e53d3ffab80ef11f36b8cfa15f631b0..68002fef2793d5a8fbe5e507aa43ca6e8e358c75 100644 (file)
--- a/reg_svr/requests.c
+++ b/reg_svr/requests.c
@@ -71,7 +71,7 @@ void clear_req(struct request_save *req)
 
 void req_initialize(void)
 {
-  register int i;
+  int i;
 
   /* Get service information from /etc/services */
   if (!(sp = getservbyname("sms_ureg", "udp")))
@@ -105,7 +105,7 @@ void req_initialize(void)
 
 int handle_retransmitted(void)
 {
-  register int i;              /* A counter */
+  int i;                       /* A counter */
   int status = FALSE;          /* Return status */
 
   for (i = PREV_INDEX(cur_request_index); i != cur_request_index;
@@ -257,7 +257,7 @@ static int illegalchars[] = {
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 };
 
-int ureg_validate_char(register char *s)
+int ureg_validate_char(char *s)
 {
   while (*s)
     {

diff --git a/regtape/rafnu.c b/regtape/rafnu.c
index 6bca104c9dc45a89881082c45dcf4d2b48cc0282..4f9cbc48f96dcb7598bf9c74f86514cf979ca7ee 100644 (file)
--- a/regtape/rafnu.c
+++ b/regtape/rafnu.c
@@ -13,9 +13,9 @@ static char *rcsid_rafnu_c = "$Header$";
 #include <stdio.h>
 #include <ctype.h>
 
-FixCase(register char *p)
+FixCase(char *p)
 {
-  register int cflag;
+  int cflag;
 
   for (cflag = 0; *p; p++)
     {
@@ -28,11 +28,10 @@ FixCase(register char *p)
     }
 }
 
-LookForJrAndIII(register char *nm, register int *pends_sr,
-               register int *pends_jr, register int *pends_iii,
-               register int *pends_iv)
+LookForJrAndIII(char *nm, int *pends_sr, int *pends_jr, int *pends_iii,
+               int *pends_iv)
 {
-  register int len = strlen(nm);
+  int len = strlen(nm);
 
   if (len >= 4 && !strcmp(nm + len - 3, " SR"))
     {
@@ -66,7 +65,7 @@ LookForJrAndIII(register char *nm, register int *pends_sr,
     }
 }
 
-LookForSt(register char *nm)                   /* ST PIERRE, etc. */
+LookForSt(char *nm)                    /* ST PIERRE, etc. */
 {
   char temp[256];
 
@@ -78,7 +77,7 @@ LookForSt(register char *nm)                  /* ST PIERRE, etc. */
     }
 }
 
-LookForO(register char *nm)                    /* O BRIEN, etc. */
+LookForO(char *nm)                     /* O BRIEN, etc. */
 {
   if (!strcmp(nm, "O ") && isalpha(nm[2]))
     nm[1] = '\'';

diff --git a/server/cache.pc b/server/cache.pc
index 66ca1827215ab64e01562ea2a1de49b86f2155e4..eb49781f8b6e15534e81569112f4c750f2d86cca 100644 (file)
--- a/server/cache.pc
+++ b/server/cache.pc
@@ -45,7 +45,7 @@ int cachehits = 0, cachemisses = 0;
 
 int hashname(char *name, enum tables type)
 {
-  register int val = type;
+  int val = type;
 
   while (*name)
     val = (val << 5) - val + *name++ - '`';
@@ -59,7 +59,7 @@ int hashname(char *name, enum tables type)
 
 void flush_cache(void)
 {
-  register struct item *i;
+  struct item *i;
 
   if (cachehits + cachemisses != 0)
     {
@@ -88,7 +88,7 @@ void flush_cache(void)
 
 int name_to_id(char *name, enum tables type, int *id)
 {
-  register struct item *i, *t;
+  struct item *i, *t;
   EXEC SQL BEGIN DECLARE SECTION;
   char *iname;
   int j, h;
@@ -194,7 +194,7 @@ int name_to_id(char *name, enum tables type, int *id)
 
 int id_to_name(int id, enum tables type, char **name)
 {
-  register struct item *i, *t;
+  struct item *i, *t;
   EXEC SQL BEGIN DECLARE SECTION;
   char iname[NAMESZ];
   int j;
@@ -295,7 +295,7 @@ int id_to_name(int id, enum tables type, char **name)
 
 int cache_entry(char *name, enum tables type, int id)
 {
-  register struct item *i, *t;
+  struct item *i, *t;
 
   for (i = cachehead.next; i != &cachehead; i = i->next)
     {
@@ -342,7 +342,7 @@ int cache_entry(char *name, enum tables type, int id)
 
 void flush_name(char *name, enum tables type)
 {
-  register struct item *i;
+  struct item *i;
 
   /* first clear it out of the transaction chain */
   for (i = &cachehead; i && i->trans; i = i->trans)
@@ -381,7 +381,7 @@ void cache_commit(void)
 
 void cache_abort(void)
 {
-  register struct item *i, *t;
+  struct item *i, *t;
 
   for (i = cachehead.trans; i; i = t)
     {

diff --git a/server/mr_glue.c b/server/mr_glue.c
index 7ad886f134f2ffb29cf5ea4f496bf6aa0718edf3..55a1324727830a01e8416e03c3736069b36a5956 100644 (file)
--- a/server/mr_glue.c
+++ b/server/mr_glue.c
@@ -36,7 +36,7 @@ void reapchild();
 
 int mr_connect(char *server)
 {
-  register int status;
+  int status;
   extern int query_timeout;
   struct sigaction action;
 
@@ -178,7 +178,7 @@ struct query pseudo_query = {
 
 int trigger_dcm(int dummy0, int dummy1, client *cl)
 {
-  register int pid, status;
+  int pid, status;
   char prog[128];
 
   if ((status = check_query_access(&pseudo_query, 0, cl)))

diff --git a/server/mr_main.c b/server/mr_main.c
index c203c32f1dc5393215abfd3810df0976e72b3794..cd021540ef1b93f95e6eb45ac150c4dcd8626d18 100644 (file)
--- a/server/mr_main.c
+++ b/server/mr_main.c
@@ -197,7 +197,7 @@ int main(int argc, char **argv)
    */
   while (!takedown)
     {
-      register int i;
+      int i;
       /*
        * Block until something happens.
        */
@@ -348,7 +348,7 @@ void do_reset_listen(void)
  */
 int new_connection(void)
 {
-  register client *cp;
+  client *cp;
   static counter = 0;
 
   /*
@@ -479,8 +479,8 @@ void oplist_append(LIST_OF_OPERATIONS *oplp, OPERATION op)
 
 void oplist_delete(LIST_OF_OPERATIONS oplp, OPERATION op)
 {
-  register OPERATION *s;
-  register int c;
+  OPERATION *s;
+  int c;
 
   for (s = oplp->op, c = oplp->count; c; --c, ++s)
     {

diff --git a/server/mr_scall.c b/server/mr_scall.c
index 91e8157f3812c9a7777aadd356734ef681bcfaff..90e661b94d09793fda474ba42846bffa414cefe8 100644 (file)
--- a/server/mr_scall.c
+++ b/server/mr_scall.c
@@ -163,10 +163,10 @@ void do_call(client *cl)
 
 free_rtn_tuples(client *cp)
 {
-  register returned_tuples *temp;
+  returned_tuples *temp;
   for (temp = cp->first; temp && OP_DONE(temp->op); )
     {
-      register returned_tuples *t1 = temp;
+      returned_tuples *t1 = temp;
       temp = t1->next;
       if (t1 == cp->last)
        cp->last = NULL;
@@ -178,14 +178,14 @@ free_rtn_tuples(client *cp)
   cp->first = temp;
 }
 
-retr_callback(register int argc, register char **argv, char *p_cp)
+retr_callback(int argc, char **argv, char *p_cp)
 {
-  register client *cp = (client *)p_cp;
+  client *cp = (client *)p_cp;
   mr_params *arg_tmp;
   returned_tuples *tp;
   OPERATION op_tmp;
-  register char **nargv;
-  register int i;
+  char **nargv;
+  int i;
 
   if (row_count++ >= max_row_count)
     {
@@ -218,7 +218,7 @@ retr_callback(register int argc, register char **argv, char *p_cp)
   arg_tmp->mr_argv = nargv;
   for (i = 0; i < argc; i++)
     {
-      register int len = strlen(argv[i]) + 1;
+      int len = strlen(argv[i]) + 1;
       nargv[i] = malloc(len);
       memcpy(nargv[i], argv[i], len);
     }
@@ -249,7 +249,7 @@ int list_users(int (*callbk)(), char *callarg)
 
   for (i = 0; i < nclients; i++)
     {
-      register client *cl = clients[i];
+      client *cl = clients[i];
       if (cl->clname)
        argv[0] = cl->clname;
       else argv[0] = "unauthenticated";
@@ -268,9 +268,9 @@ int list_users(int (*callbk)(), char *callarg)
   return 0;
 }
 
-do_retr(register client *cl)
+do_retr(client *cl)
 {
-  register char *queryname;
+  char *queryname;
 
   cl->reply.mr_argc = 0;
   cl->reply.mr_status = 0;
@@ -337,7 +337,7 @@ struct query pseudo_query = {
 
 int trigger_dcm(int dummy0, int dummy1, client *cl)
 {
-  register int pid;
+  int pid;
   char prog[128];
 
   cl->reply.mr_argc = 0;

diff --git a/server/mr_util.c b/server/mr_util.c
index 9b9e67d40feb170809aee5efd54cc1001604635d..5c5894385766b8d3d0cb136d42ef50605bf0c4a0 100644 (file)
--- a/server/mr_util.c
+++ b/server/mr_util.c
@@ -21,10 +21,10 @@ static char *rcsid_mr_util_c = "$Header$";
 
 extern char *whoami;
 
-char *requote(char *buf, register char *cp, int len)
+char *requote(char *buf, char *cp, int len)
 {
-  register int count = 0;
-  register unsigned char c;
+  int count = 0;
+  unsigned char c;
   if (len <= 2)
     return buf;
   *buf++ = '"';
@@ -56,8 +56,8 @@ char *requote(char *buf, register char *cp, int len)
 void log_args(char *tag, int version, int argc, char **argv)
 {
   char buf[BUFSIZ];
-  register int i;
-  register char *bp;
+  int i;
+  char *bp;
 
   i = strlen(tag);
   sprintf(buf, "%s[%d]: ", tag, version);
@@ -103,8 +103,8 @@ void mr_com_err(const char *whoami, long code, const char *fmt, va_list pvar)
 
 int mr_trim_args(int argc, char **argv)
 {
-  register char **arg;
-  register unsigned char *p, *lastch;
+  char **arg;
+  unsigned char *p, *lastch;
 
   for (arg = argv; argc--; arg++)
     {

diff --git a/server/qfollow.pc b/server/qfollow.pc
index 52ec57039ef403d786f0f555ad5f3988f66c19ac..66451711b74811666cfead588dcabbe0d3b357aa 100644 (file)
--- a/server/qfollow.pc
+++ b/server/qfollow.pc
@@ -294,7 +294,7 @@ int followup_fix_modby(struct query *q, struct save_queue *sq,
                       struct validate *v, int (*action)(), int actarg,
                       client *cl)
 {
-  register int i, j;
+  int i, j;
   char **argv;
   int id, status;
 
@@ -329,7 +329,7 @@ int followup_fix_modby(struct query *q, struct save_queue *sq,
 int followup_guax(struct query *q, struct save_queue *sq, struct validate *v,
                  int (*action)(), int actarg, client *cl)
 {
-  register int i, j;
+  int i, j;
   char **argv;
 #ifdef GDSS
   unsigned char sigbuf[256];
@@ -866,7 +866,7 @@ int followup_glin(struct query *q, struct save_queue *sq, struct validate *v,
 int followup_gqot(struct query *q, struct save_queue *sq, struct validate *v,
                  int (*action)(), int actarg, client *cl)
 {
-  register int j;
+  int j;
   char **argv;
   EXEC SQL BEGIN DECLARE SECTION;
   int id;
@@ -1080,7 +1080,7 @@ int followup_dqot(struct query *q, char **argv, client *cl)
 int followup_gpce(struct query *q, struct save_queue *sq, struct validate *v,
                  int (*action)(), int actarg, client *cl)
 {
-  register int i, j;
+  int i, j;
   char **argv;
   int id, status;
 

diff --git a/server/qrtn.pc b/server/qrtn.pc
index f111c39feb500d8695024229c156f0aa39119068..c1b7297fb03710dc75427a119100644fb0e0e8bf 100644 (file)
--- a/server/qrtn.pc
+++ b/server/qrtn.pc
@@ -86,7 +86,7 @@ EXEC SQL WHENEVER SQLERROR DO dbmserr();
 
 int mr_open_database(void)
 {
-  register int i;
+  int i;
   SQLDA *mr_alloc_sqlda();
   static first_open = 1;
 
@@ -145,9 +145,9 @@ int mr_check_access(client *cl, char *name, int argc, char *argv_ro[])
 int mr_process_query(client *cl, char *name, int argc, char *argv_ro[],
                     int (*action)(), char *actarg)
 {
-  register struct query *q;
-  register int status;
-  register struct validate *v;
+  struct query *q;
+  int status;
+  struct validate *v;
   char qual[256];
   char sort[32];
   char *pqual;
@@ -462,8 +462,8 @@ int build_qual(char *fmt_buf, int argc, char *argv[], char *qual)
 
 char *build_sort(struct validate *v, char *sort)
 {
-  register struct valobj *vo;
-  register int n;
+  struct valobj *vo;
+  int n;
   char elem[16];
 
   n = v->objcnt;
@@ -492,11 +492,11 @@ int privileged;
 
 int mr_verify_query(client *cl, struct query *q, int argc, char *argv_ro[])
 {
-  register int argreq;
-  register int status;
-  register struct validate *v = q->validate;
-  register int i;
-  register char *to, *fr, *stop;
+  int argreq;
+  int status;
+  struct validate *v = q->validate;
+  int i;
+  char *to, *fr, *stop;
 
   privileged = 0;
 
@@ -640,7 +640,7 @@ int do_retrieve(struct query *q, char *pqual, char *psort,
 
 char *sqlstrstr(char *str, char *pat)
 {
-  register char *p = pat;
+  char *p = pat;
 
   do
     {
@@ -652,7 +652,7 @@ char *sqlstrstr(char *str, char *pat)
        }
       if (*str == *p)
        {
-         register char *s;
+         char *s;
          s = str;
          while (*++p && (*++s == *p))
            ;
@@ -747,7 +747,7 @@ void build_sql_stmt(char *result_buf, char *cmd, char *targetlist,
                    char *argv[], char *qual)
 {
   char fmt_buf[MR_STMTBUF_LEN];
-  register char *res, *fmt;
+  char *res, *fmt;
 
   if (qual)
     sprintf(fmt_buf, "%s %s WHERE %s", cmd, targetlist, qual);
@@ -935,7 +935,7 @@ int set_krb_mapping(char *name, char *login, int ok, int *kid, int *uid)
 
 void sanity_check_queries(void)
 {
-  register int i;
+  int i;
   int maxv = 0, maxa = 0;
   extern int QueryCount2;
   extern struct query Queries2[];

diff --git a/server/qsetup.pc b/server/qsetup.pc
index 417fd86d3cc0010f4e544d68d70b889d7c2cb9d0..a59d253bed603adb7ca10066490ba7a827331728 100644 (file)
--- a/server/qsetup.pc
+++ b/server/qsetup.pc
@@ -609,9 +609,9 @@ int check_nfs(int mach_id, char *name, char *access)
   char dir[81];
   int mid = mach_id;
   EXEC SQL END DECLARE SECTION;
-  register int status;
-  register char *cp1;
-  register char *cp2;
+  int status;
+  char *cp1;
+  char *cp2;
 
   status = MR_NFS;
   EXEC SQL DECLARE csr101 CURSOR FOR

diff --git a/server/qsubs.c b/server/qsubs.c
index 083d198f8d1339319c489b4f9f3275d73b6a1fc2..08e69d21877b0ddc413225a70f8e49d00d1abc9f 100644 (file)
--- a/server/qsubs.c
+++ b/server/qsubs.c
@@ -21,10 +21,10 @@ static char *rcsid_qsubs_c = "$Header$";
 extern struct query Queries2[];
 extern int QueryCount2;
 
-struct query *get_query_by_name(register char *name, int version)
+struct query *get_query_by_name(char *name, int version)
 {
-  register struct query *q;
-  register int i;
+  struct query *q;
+  int i;
 
   q = Queries2;
   i = QueryCount2;
@@ -53,10 +53,10 @@ struct query *get_query_by_name(register char *name, int version)
 
 void list_queries(int version, int (*action)(), char *actarg)
 {
-  register struct query *q;
-  register int i;
+  struct query *q;
+  int i;
   static struct query **squeries2 = NULL;
-  register struct query **sq;
+  struct query **sq;
   char qnames[80];
   char *qnp;
   int count;
@@ -88,10 +88,10 @@ void list_queries(int version, int (*action)(), char *actarg)
   (*action)(1, &qnp, actarg);
 }
 
-void help_query(register struct query *q, int (*action)(), char *actarg)
+void help_query(struct query *q, int (*action)(), char *actarg)
 {
-  register int argcount;
-  register int i;
+  int argcount;
+  int i;
   char argn[32];
   char qname[512];
   char argr[512];

diff --git a/server/qvalidate.pc b/server/qvalidate.pc
index dbc58fe1118534d5cf55026e219161b8d17ba75f..fa25f891bd29018260c1811db9082dbd8c1064ef 100644 (file)
--- a/server/qvalidate.pc
+++ b/server/qvalidate.pc
@@ -47,7 +47,7 @@ EXEC SQL WHENEVER SQLERROR DO dbmserr();
 
 /* Validation Routines */
 
-int validate_row(register struct query *q, char *argv[], register struct validate *v)
+int validate_row(struct query *q, char *argv[], struct validate *v)
 {
   EXEC SQL BEGIN DECLARE SECTION;
   char qual[128];
@@ -76,10 +76,9 @@ int validate_row(register struct query *q, char *argv[], register struct validat
   return MR_EXISTS;
 }
 
-int validate_fields(struct query *q, register char *argv[],
-                   register struct valobj *vo, register int n)
+int validate_fields(struct query *q, char *argv[], struct valobj *vo, int n)
 {
-  register int status;
+  int status;
 
   while (--n >= 0)
     {
@@ -198,7 +197,7 @@ static int illegalchars[] = {
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 };
 
-int validate_chars(char *argv[], register struct valobj *vo)
+int validate_chars(char *argv[], struct valobj *vo)
 {
   char *s = argv[vo->index];
   int arg;
@@ -228,14 +227,14 @@ int validate_chars(char *argv[], register struct valobj *vo)
 }
 
 
-int validate_id(struct query *q, char *argv[], register struct valobj *vo)
+int validate_id(struct query *q, char *argv[], struct valobj *vo)
 {
   EXEC SQL BEGIN DECLARE SECTION;
   char *name, *namefield, *idfield;
   int id, rowcount, tbl;
   EXEC SQL END DECLARE SECTION;
   int status;
-  register char *c;
+  char *c;
 
   name = argv[vo->index];
   tbl = vo->table;
@@ -289,10 +288,10 @@ int validate_id(struct query *q, char *argv[], register struct valobj *vo)
     }
 }
 
-int validate_name(char *argv[], register struct valobj *vo)
+int validate_name(char *argv[], struct valobj *vo)
 {
   char *name, *namefield;
-  register char *c;
+  char *c;
 
   name = argv[vo->index];
   namefield = vo->namefield;
@@ -320,7 +319,7 @@ int validate_rename(char *argv[], struct valobj *vo)
   int id;
   EXEC SQL END DECLARE SECTION;
   int status;
-  register char *c;
+  char *c;
 
   status = validate_chars(argv, vo);
   if (status != MR_EXISTS)
@@ -361,14 +360,14 @@ int validate_rename(char *argv[], struct valobj *vo)
 }
 
 
-int validate_type(char *argv[], register struct valobj *vo)
+int validate_type(char *argv[], struct valobj *vo)
 {
   EXEC SQL BEGIN DECLARE SECTION;
   char *typename;
   char *val;
   int cnt;
   EXEC SQL END DECLARE SECTION;
-  register char *c;
+  char *c;
 
   typename = vo->namefield;
   c = val = argv[vo->index];
@@ -394,7 +393,7 @@ int validate_type(char *argv[], register struct valobj *vo)
 
 /* validate member or type-specific data field */
 
-int validate_typedata(register struct query *q, register char *argv[], register struct valobj *vo)
+int validate_typedata(struct query *q, char *argv[], struct valobj *vo)
 {
   EXEC SQL BEGIN DECLARE SECTION;
   char *name;
@@ -403,7 +402,7 @@ int validate_typedata(register struct query *q, register char *argv[], register
   int id;
   EXEC SQL END DECLARE SECTION;
   int status;
-  register char *c;
+  char *c;
 
   /* get named object */
   name = argv[vo->index];
@@ -503,7 +502,7 @@ int validate_typedata(register struct query *q, register char *argv[], register
 
 
 /* Make sure the data fits in the field */
-int validate_len(register char *argv[], register struct valobj *vo)
+int validate_len(char *argv[], struct valobj *vo)
 {
   EXEC SQL BEGIN DECLARE SECTION;
   int len;
@@ -590,7 +589,7 @@ char *sqlbuffer[QMAXARGS];
 SQLDA *mr_alloc_sqlda()
 {
   SQLDA *it;
-  register int j;
+  int j;
 
   it = sqlald(QMAXARGS, ARGLEN, 0);
   if (!it)
@@ -614,7 +613,7 @@ SQLDA *mr_alloc_sqlda()
 int convert_wildcards(char *arg)
 {
   static char buffer[ARGLEN];
-  register char *s, *d;
+  char *s, *d;
 
   for (d = buffer, s = arg; *s; s++)
     {
@@ -657,7 +656,7 @@ int convert_wildcards(char *arg)
 int convert_wildcards_uppercase(char *arg)
 {
   static char buffer[ARGLEN];
-  register char *s, *d;
+  char *s, *d;
 
   for (d = buffer, s = arg; *s; s++)
     {

diff --git a/update/auth_002.c b/update/auth_002.c
index cd11f531665d5605d37c14086c655a8da50bba34..fa9a31e12d6770d72050467ac60197ddc178913c 100644 (file)
--- a/update/auth_002.c
+++ b/update/auth_002.c
@@ -142,7 +142,7 @@ auth_failed:
   sprintf(buf, "auth for %s.%s@%s failed: %s",
          ad.pname, ad.pinst, ad.prealm, error_message(code));
   {
-    register int rc;
+    int rc;
     rc = send_object(conn, (char *)&code, INTEGER_T);
     code = rc;
   }

diff --git a/update/checksum.c b/update/checksum.c
index 6347c16e6a5d11d0d0b49f50950818b45158ceb3..fdb47266e337eed916f73ae2c15145474c915e77 100644 (file)
--- a/update/checksum.c
+++ b/update/checksum.c
@@ -22,9 +22,9 @@ static char *rcsid_checksum_c = "$Header$";
 
 int checksum_file(char *path)
 {
-  register int sum;
-  register int ch;
-  register FILE *f;
+  int sum;
+  int ch;
+  FILE *f;
 
   sum = 0;
   f = fopen(path, "r");

diff --git a/update/client.c b/update/client.c
index 30aaa1aefb1403b9e3173937d14852544d24a42c..628a41628cb18b5e2d769bc3f04a7295bd9c1468 100644 (file)
--- a/update/client.c
+++ b/update/client.c
@@ -78,7 +78,7 @@ int send_auth(char *host_name)
   KTEXT_ST ticket_st;
   KTEXT ticket = &ticket_st;
   STRING data;
-  register int code;
+  int code;
   int response;
   int auth_version = 2;
 
@@ -146,7 +146,7 @@ int execute(char *path)
 {
   int response;
   STRING data;
-  register int code;
+  int code;
 
   string_alloc(&data, BUFSIZ);
   sprintf(STRING_DATA(data), "EXEC_002 %s", path);

diff --git a/update/get_file.c b/update/get_file.c
index e8d6de675961a65f77fda98b43d1f6552c19e735..8ce07b3c7f6d7eb4b4a4fffdc1aac63e5b99e2fd 100644 (file)
--- a/update/get_file.c
+++ b/update/get_file.c
@@ -113,7 +113,7 @@ int get_file(char *pathname, int file_size, int checksum,
   n_written = 0;
   while (n_written < file_size)
     {
-      register int n_wrote;
+      int n_wrote;
       n_wrote = write(fd, buf, sizeof(buf));
       if (n_wrote == -1)
        {
@@ -234,7 +234,7 @@ static int get_block(int fd, int max_size, int encrypt)
   n = 0;
   while (n < n_read)
     {
-      register int n_wrote;
+      int n_wrote;
       n_wrote = write(fd, STRING_DATA(data) + n, n_read - n);
       if (n_wrote == -1)
        {

diff --git a/update/log.c b/update/log.c
index 2f31db2f72d7a8d38c128ee8f833c82c60b9f9fb..c4cf6319cf26ccc4633694ea77a59e20ac519d9e 100644 (file)
--- a/update/log.c
+++ b/update/log.c
@@ -95,7 +95,7 @@ static char fmt[] = "[%s] %s";
 #define        def(name, level, prio) \
 name(char *msg)\
 {\
-   register int old_prio; \
+   int old_prio; \
    old_prio = log_priority; \
    mr_update_initialize(); \
    com_err(whoami, 0, fmt, level, msg); \

diff --git a/update/ticket.c b/update/ticket.c
index 36aee35159d0d9c6fb89e016f42370e655ce0d61..3b081f8d4cd0da0b07c1f42464fc36045284b7b0 100644 (file)
--- a/update/ticket.c
+++ b/update/ticket.c
@@ -46,8 +46,8 @@ static init(void)
 
 int get_mr_update_ticket(char *host, KTEXT ticket)
 {
-  register int code;
-  register int pass;
+  int code;
+  int pass;
   char phost[BUFSIZ];
   CREDENTIALS cr;
 
@@ -84,7 +84,7 @@ try_it:
 
 int get_mr_tgt(void)
 {
-  register int code;
+  int code;
   char linst[INST_SZ], kinst[INST_SZ];
 
   init();

diff --git a/update/update_server.c b/update/update_server.c
index d6ccb66d347b6996d275193d98b82da67996391c..77373fa47a0dfa80b42b3382a55afb3ace0bc420 100644 (file)
--- a/update/update_server.c
+++ b/update/update_server.c
@@ -149,7 +149,7 @@ int main(int argc, char **argv)
   /* got a connection; loop forever */
   while (1)
     {
-      register char *cp;
+      char *cp;
       code = receive_object(conn, (char *)&str, STRING_T);
       if (code)
        {