summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsc <rsc>2007-08-08 09:30:48 +0000
committerrsc <rsc>2007-08-08 09:30:48 +0000
commit115e177400d50838986840ff382ee644f291216b (patch)
tree371cbb6d02ee63ddd125127a7c2c50563c8b88b0
parentd80b06a1e0232f4c5e9b9c8ff635e4022e13667c (diff)
downloadxv6-labs-115e177400d50838986840ff382ee644f291216b.tar.gz
xv6-labs-115e177400d50838986840ff382ee644f291216b.tar.bz2
xv6-labs-115e177400d50838986840ff382ee644f291216b.zip
standardize on not using unsigned keyword
-rw-r--r--ulib.c6
-rw-r--r--user.h4
-rw-r--r--usertests.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/ulib.c b/ulib.c
index ce4e13d..994ceb9 100644
--- a/ulib.c
+++ b/ulib.c
@@ -25,10 +25,10 @@ strcmp(const char *p, const char *q)
{
while(*p && *p == *q)
p++, q++;
- return (int) ((unsigned char) *p - (unsigned char) *q);
+ return (uchar)*p - (uchar)*q;
}
-unsigned int
+uint
strlen(char *s)
{
int n = 0;
@@ -38,7 +38,7 @@ strlen(char *s)
}
void*
-memset(void *dst, int c, unsigned int n)
+memset(void *dst, int c, uint n)
{
char *d = (char*) dst;
diff --git a/user.h b/user.h
index 1bd512d..75687b6 100644
--- a/user.h
+++ b/user.h
@@ -27,8 +27,8 @@ char* strchr(const char*, char c);
int strcmp(const char*, const char*);
void printf(int, char*, ...);
char* gets(char*, int max);
-unsigned int strlen(char*);
-void* memset(void*, int, unsigned int);
+uint strlen(char*);
+void* memset(void*, int, uint);
void* malloc(uint);
void free(void*);
int atoi(const char*);
diff --git a/usertests.c b/usertests.c
index 16be8b0..beae189 100644
--- a/usertests.c
+++ b/usertests.c
@@ -654,7 +654,7 @@ concreate()
int i, pid, n, fd;
char fa[40];
struct {
- unsigned short inum;
+ ushort inum;
char name[14];
} de;