From 4d375f236f6a9bcabffa173bc3036ff6b7aec220 Mon Sep 17 00:00:00 2001 From: mrg Date: Wed, 10 May 2006 21:14:48 +0000 Subject: [PATCH] rename exp2() to csh_exp2(). (bah, we don't even have an exp2()) --- bin/csh/exp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/csh/exp.c b/bin/csh/exp.c index 63afdc931a62..78d7922c1b5c 100644 --- a/bin/csh/exp.c +++ b/bin/csh/exp.c @@ -1,4 +1,4 @@ -/* $NetBSD: exp.c,v 1.14 2003/08/07 09:05:05 agc Exp $ */ +/* $NetBSD: exp.c,v 1.15 2006/05/10 21:14:48 mrg Exp $ */ /*- * Copyright (c) 1980, 1991, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)exp.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: exp.c,v 1.14 2003/08/07 09:05:05 agc Exp $"); +__RCSID("$NetBSD: exp.c,v 1.15 2006/05/10 21:14:48 mrg Exp $"); #endif #endif /* not lint */ @@ -70,7 +70,7 @@ __RCSID("$NetBSD: exp.c,v 1.14 2003/08/07 09:05:05 agc Exp $"); #define NOTEQMATCH 8 static int exp1(Char ***, bool); -static int exp2(Char ***, bool); +static int csh_exp2(Char ***, bool); static int exp2a(Char ***, bool); static int exp2b(Char ***, bool); static int exp2c(Char ***, bool); @@ -121,7 +121,7 @@ exp1(Char ***vp, bool ignore) { int p1; - p1 = exp2(vp, ignore); + p1 = csh_exp2(vp, ignore); #ifdef EDEBUG etraci("exp1 p1", p1, vp); #endif @@ -139,7 +139,7 @@ exp1(Char ***vp, bool ignore) } static int -exp2(Char ***vp, bool ignore) +csh_exp2(Char ***vp, bool ignore) { int p1; @@ -151,7 +151,7 @@ exp2(Char ***vp, bool ignore) int p2; (*vp)++; - p2 = exp2(vp, ignore); + p2 = csh_exp2(vp, ignore); #ifdef EDEBUG etraci("exp3 p2", p2, vp); #endif