summaryrefslogtreecommitdiff
path: root/defs.h
diff options
context:
space:
mode:
authorRuss Cox <[email protected]>2011-01-11 13:01:13 -0500
committerRuss Cox <[email protected]>2011-01-11 13:01:13 -0500
commit1a81e38b17144624415d252a521fd5a06079d681 (patch)
treeea7d895bcf77aa25861c09ee490488b6f729e0f3 /defs.h
parent240679608cd46649d1144408f28f83141f9f3a86 (diff)
downloadxv6-labs-1a81e38b17144624415d252a521fd5a06079d681.tar.gz
xv6-labs-1a81e38b17144624415d252a521fd5a06079d681.tar.bz2
xv6-labs-1a81e38b17144624415d252a521fd5a06079d681.zip
make new code like old code
Variable declarations at top of function, separate from initialization. Use == 0 instead of ! for checking pointers. Consistent spacing around {, *, casts. Declare 0-parameter functions as (void) not (). Integer valued functions return -1 on failure, 0 on success.
Diffstat (limited to 'defs.h')
-rw-r--r--defs.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/defs.h b/defs.h
index d08609d..43f35d2 100644
--- a/defs.h
+++ b/defs.h
@@ -62,7 +62,7 @@ void ioapicinit(void);
// kalloc.c
char* kalloc(void);
void kfree(char*);
-void kinit();
+void kinit(void);
// kbd.c
void kbdintr(void);
@@ -117,8 +117,8 @@ void getcallerpcs(void*, uint*);
int holding(struct spinlock*);
void initlock(struct spinlock*, char*);
void release(struct spinlock*);
-void pushcli();
-void popcli();
+void pushcli(void);
+void popcli(void);
// string.c
int memcmp(const void*, const void*, uint);
@@ -164,7 +164,7 @@ void inituvm(pde_t*, char*, uint);
int loaduvm(pde_t*, char*, struct inode *, uint, uint);
pde_t* copyuvm(pde_t*,uint);
void switchuvm(struct proc*);
-void switchkvm();
+void switchkvm(void);
int copyout(pde_t *pgdir, uint va, void *buf, uint len);
// number of elements in fixed-size array