Rename xmalloc() as malloc_or_panic(),

[pintos-anon] / src / threads / malloc.h

diff --git a/src/threads/malloc.h b/src/threads/malloc.h
index 4f0d0bf32f370557e0a13a0dfaa1f1f2f50df4cb..a07a7b06efc89d77127dfe3fae70b2de67a17838 100644 (file)
--- a/src/threads/malloc.h
+++ b/src/threads/malloc.h
@@ -6,9 +6,9 @@
 
 void malloc_init (void);
 void *malloc (size_t) __attribute__ ((malloc));
-void *xmalloc (size_t) __attribute__ ((malloc));
+void *malloc_or_panic (size_t) __attribute__ ((malloc));
 void *calloc (size_t, size_t) __attribute__ ((malloc));
-void *xcalloc (size_t, size_t) __attribute__ ((malloc));
+void *calloc_or_panic (size_t, size_t) __attribute__ ((malloc));
 void free (void *);
 
 #endif /* threads/malloc.h */