Mercurial > libjeffpc

changeset 161:67b08ecf5c1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
val: internal val allocation function should return errnos Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Tue, 11 Apr 2017 11:21:43 -0400
parents 11d55479b0e1
children 826c83434669
files include/jeffpc/val.h val.c
diffstat 2 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/include/jeffpc/val.h	Tue Apr 11 11:21:38 2017 -0400
+++ b/include/jeffpc/val.h	Tue Apr 11 11:21:43 2017 -0400
@@ -93,7 +93,7 @@
 	({					\
 		struct val *_x;			\
 		_x = val_alloc_sym(v);		\
-		ASSERT(_x);			\
+		ASSERT(!IS_ERR(_x));		\
 		_x;				\
 	})
 
@@ -104,7 +104,7 @@
 	({					\
 		struct val *_x;			\
 		_x = val_alloc_str(v);		\
-		ASSERT(_x);			\
+		ASSERT(!IS_ERR(_x));		\
 		_x;				\
 	})
 
@@ -115,7 +115,7 @@
 	({					\
 		struct val *_x;			\
 		_x = val_alloc_char(v);		\
-		ASSERT(_x);			\
+		ASSERT(!IS_ERR(_x));		\
 		_x;				\
 	})
 
@@ -123,7 +123,7 @@
 	({					\
 		struct val *_x;			\
 		_x = val_alloc_int(v);		\
-		ASSERT(_x);			\
+		ASSERT(!IS_ERR(_x));		\
 		_x;				\
 	})
 
@@ -134,7 +134,7 @@
 	({					\
 		struct val *_x;			\
 		_x = val_alloc_cons((head), (tail));\
-		ASSERT(_x);			\
+		ASSERT(!IS_ERR(_x));		\
 		_x;				\
 	})
 
--- a/val.c	Tue Apr 11 11:21:38 2017 -0400
+++ b/val.c	Tue Apr 11 11:21:43 2017 -0400
@@ -70,7 +70,7 @@
 
 	val = mem_cache_alloc(val_cache);
 	if (!val)
-		return val;
+		return ERR_PTR(-ENOMEM);
 
 	val->type = type;
 	val->static_alloc = false;
@@ -109,8 +109,8 @@
 	struct val *val;					\
 								\
 	val = __val_alloc(vttype);				\
-	if (!val)						\
-		return NULL;					\
+	if (IS_ERR(val))					\
+		return val;					\
 								\
 	val->_set_##valelem = v;				\
 								\
@@ -159,8 +159,8 @@
 	struct val *val;
 
 	val = __val_alloc(VT_CONS);
-	if (!val)
-		return NULL;
+	if (IS_ERR(val))
+		return val;
 
 	val->_set_cons.head = head;
 	val->_set_cons.tail = tail;