Changes include: sccsid -> rcsid, bcopy -> memcpy, don't use the

register keyword, and -Wall cleaning.

Obtained from: similar changes in NetBSD

1 files changed, 30 insertions, 27 deletions

diff --git a/bin/csh/exec.c b/bin/csh/exec.c
index 4c3fb5e..1815eae 100644
--- a/bin/csh/exec.c
+++ b/bin/csh/exec.c
@@ -29,12 +29,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 5/31/93";
+#else
+static const char rcsid[] =
+	"$Id: exec.c,v 1.6 1997/02/22 14:01:50 peter Exp $";
+#endif
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -113,10 +116,10 @@ doexec(v, t)
     Char **v;
     struct command *t;
 {
-    register Char *dp, **pv, **av, *sav;
-    register struct varent *pathv;
-    register bool slash;
-    register int hashval = 0, hashval1, i;
+    Char *dp, **pv, **av, *sav;
+    struct varent *pathv;
+    bool slash;
+    int hashval = 0, hashval1, i;
     Char   *blk[2];
 
     /*
@@ -265,12 +268,12 @@ pexerr()
 static void
 texec(sf, st)
     Char   *sf;
-    register Char **st;
+    Char **st;
 {
-    register char **t;
-    register char *f;
-    register struct varent *v;
-    register Char **vp;
+    char **t;
+    char *f;
+    struct varent *v;
+    Char **vp;
     Char   *lastsh[2];
     int     fd;
     unsigned char c;
@@ -361,7 +364,7 @@ texec(sf, st)
 void
 execash(t, kp)
     Char  **t;
-    register struct command *kp;
+    struct command *kp;
 {
     int     saveIN, saveOUT, saveDIAG, saveSTD;
     int     oSHIN;
@@ -446,8 +449,8 @@ dohash(v, t)
     struct command *t;
 {
     DIR    *dirp;
-    register struct dirent *dp;
-    register int cnt;
+    struct dirent *dp;
+    int cnt;
     int     i = 0;
     struct varent *pathv = adrof(STRpath);
     Char  **pv;
@@ -504,9 +507,9 @@ hashstat(v, t)
  */
 static int
 hashname(cp)
-    register Char *cp;
+    Char *cp;
 {
-    register long h = 0;
+    long h = 0;
 
     while (*cp)
 	h = hash(h, *cp++);
@@ -517,11 +520,11 @@ static int
 iscommand(name)
     Char   *name;
 {
-    register Char **pv;
-    register Char *sav;
-    register struct varent *v;
-    register bool slash = any(short2str(name), '/');
-    register int hashval = 0, hashval1, i;
+    Char **pv;
+    Char *sav;
+    struct varent *v;
+    bool slash = any(short2str(name), '/');
+    int hashval = 0, hashval1, i;
 
     v = adrof(STRpath);
     if (v == 0 || v->vec[0] == 0 || slash)
@@ -618,7 +621,7 @@ executable(dir, name, dir_ok)
 /*ARGSUSED*/
 void
 dowhich(v, c)
-    register Char **v;
+    Char **v;
     struct command *c;
 {
     struct wordent lex[3];
@@ -652,9 +655,9 @@ static void
 tellmewhat(lex)
     struct wordent *lex;
 {
-    register int i;
-    register struct biltins *bptr;
-    register struct wordent *sp = lex->next;
+    int i;
+    struct biltins *bptr;
+    struct wordent *sp = lex->next;
     bool    aliased = 0;
     Char   *s0, *s1, *s2, *cmd;
     Char    qc;
@@ -706,8 +709,8 @@ tellmewhat(lex)
     sp->word = cmd = globone(sp->word, G_IGNORE);
 
     if ((i = iscommand(strip(sp->word))) != 0) {
-	register Char **pv;
-	register struct varent *v;
+	Char **pv;
+	struct varent *v;
 	bool    slash = any(short2str(sp->word), '/');
 
 	v = adrof(STRpath);