lacpi_utils: propogate errors

Author: kpowkitty

stand/liblua/Makefile

@@ -32,7 +32,7 @@ SRCS+=	lhash.c
 # ACPI
 .if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 0
 .PATH: ${LIBLUASRC}/acpi
-SRCS+=  lacpi.c lacpi_object.c lacpi_utils.c lacpi_walk.c lacp_data.c
+SRCS+=  lacpi.c lacpi_object.c lacpi_utils.c lacpi_walk.c lacpi_data.c
 CFLAGS+= -I${SYSDIR}/contrib/dev/acpica/include \
 	 -I${EFISRC}/libacpi/acpi/include -I${EFISRC}/include \
 	 -I${EFISRC}/include/amd64 -I${LIBLUASRC}/acpi/include

stand/liblua/acpi/include/lacpi_utils.h

@@ -8,13 +8,20 @@
 /***** UTILITY *****/
 
 /* verifies lua passed over a handle on the stack */
-ACPI_HANDLE lua_check_handle(lua_State *L, int idx);
+ACPI_HANDLE lacpi_check_handle(lua_State *L, int idx);
 
 /* destructor dispatcher */
 typedef void (*acpi_destructor_t)(ACPI_OBJECT *);
 
 /* safety check -- lua stores integers as 64bit */
-UINT32 lua_int_to_uint32(lua_State *L, int index, const char *errmsg);
+ACPI_STATUS lacpi_int_to_uint32(lua_State *L, int index, UINT32 *num);
+
+/* build error code and push it onto stack */
+int lacpi_push_err(lua_State *L, const int push_nil, const char *errmsg,
+    const ACPI_STATUS status);
+
+/* extract error message relating to ACPI_STATUS */
+char *lacpi_extract_status(const ACPI_STATUS status);
 
 /***** FACTORY *****/
 
@@ -23,14 +30,14 @@ int lacpi_create_mt_gc(lua_State *L, const char *mt, lua_CFunction gc_func);
 
 /*** ACPI_OBJECT ***/
 /* build ACPI_OBJECTs */
-void build_int(lua_State *L, ACPI_OBJECT *obj);
-void build_str(lua_State *L, ACPI_OBJECT *obj);
-void build_buff(lua_State *L, ACPI_OBJECT *obj);
-void build_pkg(lua_State *L, ACPI_OBJECT *obj);
-void build_acpi_obj(lua_State *L, ACPI_OBJECT *obj, UINT32 obj_type);
-int build_ref(lua_State *L, ACPI_OBJECT *obj);
-int build_proc(lua_State *L, ACPI_OBJECT *obj);
-int build_pow(lua_State *L, ACPI_OBJECT *obj);
+ACPI_STATUS build_int(lua_State *L, ACPI_OBJECT *obj);
+ACPI_STATUS build_str(lua_State *L, ACPI_OBJECT *obj);
+ACPI_STATUS build_buff(lua_State *L, ACPI_OBJECT *obj);
+ACPI_STATUS build_pkg(lua_State *L, ACPI_OBJECT *obj);
+ACPI_STATUS build_acpi_obj(lua_State *L, ACPI_OBJECT *obj, UINT32 obj_type);
+ACPI_STATUS build_ref(lua_State *L, ACPI_OBJECT *obj);
+ACPI_STATUS build_proc(lua_State *L, ACPI_OBJECT *obj);
+ACPI_STATUS build_pow(lua_State *L, ACPI_OBJECT *obj);
 
 /* push ACPI_OBJECTs onto lua stack */
 void push_int(lua_State *L, ACPI_OBJECT *obj);

stand/liblua/acpi/lacpi_data.c

@@ -69,13 +69,19 @@ lAcpiAttachData(lua_State *L)
 {
 	ACPI_STATUS status;	
 	ACPI_HANDLE handle = (ACPI_HANDLE) lua_touserdata(L, 1);
-	UINT32 type = lua_int_to_uint32(L, 2, "Object type must be 32 bit");
+	UINT32 type;
 	ACPI_OBJECT *obj;
 
 	if (handle == NULL) {
 		return luaL_error(L, "lAcpiAttachData: Handle is NULL");
 	}
 
+	if (ACPI_FAILURE(status = lacpi_int_to_uint32(L, 2, &type))) {
+		lua_pushnil(L);
+		lua_pushstring(L, "ACPI_OBJECT_TYPE must be a UINT32");
+		return 2;
+	}
+
 	obj = malloc(sizeof(ACPI_OBJECT));
 	if (obj == NULL) {
 		return luaL_error(L, 

stand/liblua/acpi/lacpi_object.c

@@ -18,7 +18,8 @@ lAcpiGetHandle(lua_State *L)
 	ACPI_STATUS status;
 
 	if (ACPI_FAILURE(status = AcpiGetHandle(NULL, pathname, &handle))) {
-		return luaL_error(L, "AcpiGetHandle failed with status 0x%x", status);
+		return lacpi_push_err(L, 1,
+		    "AcpiGetHandleFailed with status: ", status);
 	}
 
 	lua_pushlightuserdata(L, handle);
@@ -43,6 +44,7 @@ static int
 lAcpiEvaluateObject(lua_State *L)
 {
 	ACPI_STATUS status;
+	char errmsg[128];
 	ACPI_OBJECT_LIST obj_list;
 	ACPI_HANDLE handle = NULL;
 	ACPI_OBJECT *objs = NULL;
@@ -70,7 +72,7 @@ lAcpiEvaluateObject(lua_State *L)
 	} else if (abs_path != NULL) {
 		pathname = strdup(abs_path);
 	} else {
-		return luaL_error(L, "Incorrect arguments");	
+		return lacpi_push_err(L, 1, "Incorrect arguments", 0);
 	}
 
 	/*
@@ -98,17 +100,20 @@ lAcpiEvaluateObject(lua_State *L)
 			lua_rawgeti(L, 4, i + 1);
 			lua_getfield(L, -1, "obj_type");
 
-			if ((status = lua_int_to_uint32(L, -1, &obj_type)) 
-			    != AE_OK) {
-				lua_pushnil(L);
-				lua_pushstring(L, "ACPI_OBJECT_TYPE must be"
-						" UINT32");
+			if (ACPI_FAILURE(status = lacpi_int_to_uint32(L, -1,
+			    &obj_type))) {
 				free(objs);
-				return 2;
+				return lacpi_push_err(L, 1, 
+				    "ACPI_OBJECT_TYPE must be UINT32", 0);
 			}
 			lua_pop(L, 1);
 
-			build_acpi_obj(L, &objs[i], obj_type);
+			if (ACPI_FAILURE(status = 
+			    build_acpi_obj(L, &objs[i], obj_type))) {
+				snprintf(errmsg, sizeof(errmsg), 
+				    "Failed to build objs[%d]", i);
+				return lacpi_push_err(L, 1, errmsg, status);
+			}
 			lua_pop(L, 1);
 		}
 
@@ -128,11 +133,8 @@ lAcpiEvaluateObject(lua_State *L)
 		free_acpi_objs(objs, obj_count);
 
 		char errbuf[64];
-		snprintf(errbuf, sizeof(errbuf),
-		    "AcpiEvaluateObject failed with status 0x%x", status);
-		lua_pushnil(L);
-		lua_pushstring(L, errbuf);
-		return 2;
+		return lacpi_push_err(L, 1, 
+		    "AcpiEvaluateObject failed with status", status);
 	}
 
 	if (return_buffer.Pointer != NULL) {