summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles.Forsyth <devnull@localhost>2008-07-24 21:24:05 +0000
committerCharles.Forsyth <devnull@localhost>2008-07-24 21:24:05 +0000
commit5a75036082fbd6d5658f018879e4c2dc8020cd5f (patch)
tree090d4e1c81038c75dc1d1f44728a267d4ec86e23
parentd8ba6ca67426637410b61761b93e591175f51fcc (diff)
20080724-2223
-rw-r--r--emu/port/chan.c6
-rw-r--r--include/version.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/emu/port/chan.c b/emu/port/chan.c
index 997cb876..fc936b0f 100644
--- a/emu/port/chan.c
+++ b/emu/port/chan.c
@@ -947,8 +947,8 @@ parsename(char *name, Elemlist *e)
}
}
-void*
-memrchr(void *va, int c, long n)
+static void*
+kmemrchr(void *va, int c, long n)
{
uchar *a, *e;
@@ -1089,7 +1089,7 @@ namec(char *aname, int amode, int omode, ulong perm)
strcpy(tmperrbuf, up->env->errstr);
NameError:
len = prefix+e.off[npath];
- if(len < ERRMAX/3 || (name=memrchr(aname, '/', len))==nil || name==aname)
+ if(len < ERRMAX/3 || (name=kmemrchr(aname, '/', len))==nil || name==aname)
snprint(up->genbuf, sizeof up->genbuf, "%.*s", len, aname);
else
snprint(up->genbuf, sizeof up->genbuf, "...%.*s", (int)(len-(name-aname)), name);
diff --git a/include/version.h b/include/version.h
index 4185fca8..caf0586c 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION "Fourth Edition (20080723)"
+#define VERSION "Fourth Edition (20080724)"