cleanup

6 files changed, 53 insertions, 66 deletions

diff --git a/hieroglyph/hgdict.c b/hieroglyph/hgdict.c
index f8d9dec..7439605 100644
--- a/hieroglyph/hgdict.c
+++ b/hieroglyph/hgdict.c
@@ -929,26 +929,23 @@ hg_dict_add(hg_dict_t  *dict,
 		      hg_quark_get_type(qkey) == HG_TYPE_OPER) &&
 		    hg_mem_spool_get_type(hg_mem_spool_get(hg_quark_get_mem_id(qkey))) == HG_MEM_TYPE_LOCAL) {
 			hg_debug(HG_MSGCAT_DICT, "Unable to store the object allocated in the local memory into the global memory");
-			hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_invalidaccess);
 
-			return FALSE;
+			hg_error_return (HG_STATUS_FAILED, HG_e_invalidaccess);
 		}
 		if (!(hg_quark_is_simple_object(qval) ||
 		      hg_quark_get_type(qval) == HG_TYPE_OPER) &&
 		    hg_mem_spool_get_type(hg_mem_spool_get(hg_quark_get_mem_id(qval))) == HG_MEM_TYPE_LOCAL) {
 			hg_debug(HG_MSGCAT_DICT, "Unable to store the object allocated in the local memory into the global memory");
-			hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_invalidaccess);
 
-			return FALSE;
+			hg_error_return (HG_STATUS_FAILED, HG_e_invalidaccess);
 		}
 	}
 	if (dict->raise_dictfull &&
 	    hg_dict_length(dict) == hg_dict_maxlength(dict) &&
 	    hg_dict_lookup(dict, qkey) == Qnil) {
 		hg_debug(HG_MSGCAT_DICT, "no more spaces in the dict");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_dictfull);
 
-		return FALSE;
+		hg_error_return (HG_STATUS_FAILED, HG_e_dictfull);
 	}
 
 	qmasked = hg_quark_get_hash(qkey);
diff --git a/hieroglyph/hgfile.c b/hieroglyph/hgfile.c
index 3ffc9ac..1d1e071 100644
--- a/hieroglyph/hgfile.c
+++ b/hieroglyph/hgfile.c
@@ -139,13 +139,13 @@ _hg_object_file_initialize(hg_object_t *object,
 
 	if (name == NULL || name[0] == 0) {
 		hg_debug(HG_MSGCAT_FILE, "No filename to open");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_undefinedfilename);
-		return FALSE;
+
+		hg_error_return (HG_STATUS_FAILED, HG_e_undefinedfilename);
 	}
 	if (vtable == NULL || vtable->open == NULL) {
 		hg_debug(HG_MSGCAT_FILE, "No virtual functions");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
-		return FALSE;
+
+		hg_error_return (HG_STATUS_FAILED, HG_e_VMerror);
 	}
 
 	/* initialize the members first to avoid
@@ -279,8 +279,8 @@ _hg_file_io_real_stdin_open(hg_file_t    *file,
 
 	if (file->io_type != HG_FILE_IO_STDIN) {
 		hg_debug(HG_MSGCAT_FILE, "Invalid I/O request.");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
-		return FALSE;
+
+		hg_error_return (HG_STATUS_FAILED, HG_e_VMerror);
 	}
 	if ((file->mode & HG_FILE_IO_MODE_WRITE) != 0) {
 		errno = EBADF;
@@ -322,8 +322,8 @@ _hg_file_io_real_stdout_open(hg_file_t    *file,
 
 	if (file->io_type != HG_FILE_IO_STDOUT) {
 		hg_debug(HG_MSGCAT_FILE, "Invalid I/O request.");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
-		return FALSE;
+
+		hg_error_return (HG_STATUS_FAILED, HG_e_VMerror);
 	}
 	if ((file->mode & HG_FILE_IO_MODE_READ) != 0) {
 		errno = EBADF;
@@ -365,8 +365,8 @@ _hg_file_io_real_stderr_open(hg_file_t    *file,
 
 	if (file->io_type != HG_FILE_IO_STDERR) {
 		hg_debug(HG_MSGCAT_FILE, "Invalid I/O request.");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
-		return FALSE;
+
+		hg_error_return (HG_STATUS_FAILED, HG_e_VMerror);
 	}
 	if ((file->mode & HG_FILE_IO_MODE_READ) != 0) {
 		errno = EBADF;
@@ -430,8 +430,8 @@ _hg_file_io_real_file_open(hg_file_t    *file,
 
 	if (file->io_type != HG_FILE_IO_FILE) {
 		hg_debug(HG_MSGCAT_FILE, "Invalid I/O request.");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
-		return FALSE;
+
+		hg_error_return (HG_STATUS_FAILED, HG_e_VMerror);
 	}
 	if (data == NULL) {
 		qdata = hg_mem_alloc(file->o.mem,
@@ -682,8 +682,8 @@ _hg_file_io_real_buffered_open(hg_file_t    *file,
 		    break;
 	    default:
 		    hg_debug(HG_MSGCAT_FILE, "Invalid I/O request.");
-		    hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
-		    return FALSE;
+
+		    hg_error_return (HG_STATUS_FAILED, HG_e_VMerror);
 	}
 	bd->data.fd = -1;
 	bd->data.mmapped_buffer = NULL;
@@ -885,8 +885,8 @@ _hg_file_io_real_lineedit_open(hg_file_t    *file,
 		    break;
 	    default:
 		    hg_debug(HG_MSGCAT_FILE, "Invalid I/O request.");
-		    hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
-		    return FALSE;
+
+		    hg_error_return (HG_STATUS_FAILED, HG_e_VMerror);
 	}
 	qs = hg_string_new_with_value(file->o.mem,
 				      buf, -1,
diff --git a/hieroglyph/hgmem.c b/hieroglyph/hgmem.c
index e334d9f..227d1b4 100644
--- a/hieroglyph/hgmem.c
+++ b/hieroglyph/hgmem.c
@@ -465,7 +465,8 @@ hg_mem_alloc_with_flags(hg_mem_t     *mem,
 			}
 		}
 		hg_debug(HG_MSGCAT_MEM, "Out of memory");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
+
+		hg_error_return_val (Qnil, HG_STATUS_FAILED, HG_e_VMerror);
 	}
 
 	return retval;
@@ -527,7 +528,8 @@ hg_mem_realloc(hg_mem_t     *mem,
 			}
 		}
 		hg_debug(HG_MSGCAT_MEM, "Out of memory");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
+
+		hg_error_return_val (Qnil, HG_STATUS_FAILED, HG_e_VMerror);
 	}
 
 	return retval;
diff --git a/hieroglyph/hgoperator.c b/hieroglyph/hgoperator.c
index f998cdd..33df25c 100644
--- a/hieroglyph/hgoperator.c
+++ b/hieroglyph/hgoperator.c
@@ -9321,8 +9321,8 @@ hg_operator_invoke(hg_quark_t  qoper,
 			hg_warning("%s operator isn't yet implemented.",
 				    __hg_operator_name_table[q]);
 		}
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
-		retval = FALSE;
+
+		hg_error_return (HG_STATUS_FAILED, HG_e_VMerror);
 	} else {
 		retval = __hg_operator_func_table[q] (vm);
 	}
diff --git a/hieroglyph/hgplugin.c b/hieroglyph/hgplugin.c
index 3bb1b88..efec39d 100644
--- a/hieroglyph/hgplugin.c
+++ b/hieroglyph/hgplugin.c
@@ -226,7 +226,8 @@ hg_plugin_load(hg_plugin_t  *plugin,
 	} else {
 		hg_warning("Unable to load a plugin: %s",
 			   g_module_name(plugin->module));
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
+
+		hg_error_return (HG_STATUS_FAILED, HG_e_VMerror);
 	}
 
 	return retval;
@@ -259,7 +260,8 @@ hg_plugin_unload(hg_plugin_t  *plugin,
 	} else {
 		hg_warning("Unable to unload a plugin: %s",
 			   g_module_name(plugin->module));
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
+
+		hg_error_return (HG_STATUS_FAILED, HG_e_VMerror);
 	}
 
 	return retval;
diff --git a/hieroglyph/hgvm.c b/hieroglyph/hgvm.c
index f40f24d..94092a9 100644
--- a/hieroglyph/hgvm.c
+++ b/hieroglyph/hgvm.c
@@ -733,8 +733,8 @@ _hg_vm_restore_mark_traverse(hg_mem_t     *mem,
 
 	if (m == NULL) {
 		hg_warning("No memory spool found: %d", id);
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
-		return FALSE;
+
+		hg_error_return (HG_STATUS_FAILED, HG_e_VMerror);
 	}
 	hg_snapshot_add_ref(snapshot, qdata);
 
@@ -2544,8 +2544,8 @@ hg_vm_set_user_params(hg_vm_t    *vm,
 
 	if (!HG_IS_QDICT (qdict)) {
 		hg_debug(HG_MSGCAT_VM, "The user params isn't a dict.");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_typecheck);
-		return FALSE;
+
+		hg_error_return (HG_STATUS_FAILED, HG_e_typecheck);
 	}
 	if (qdict != Qnil) {
 		hg_dict_t *d = _HG_VM_LOCK (vm, qdict);
@@ -2815,6 +2815,7 @@ hg_vm_set_error(hg_vm_t           *vm,
 	qerrordict = hg_vm_dstack_lookup(vm, qnerrordict);
 	if (qerrordict == Qnil) {
 		hg_critical("Unable to lookup errordict");
+
 		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
 		goto fatal_error;
 	}
@@ -3098,16 +3099,14 @@ hg_vm_array_set(hg_vm_t    *vm,
 
 	if (!HG_IS_QARRAY (qarray)) {
 		hg_debug(HG_MSGCAT_ARRAY, "Not an array");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_typecheck);
 
-		return FALSE;
+		hg_error_return (HG_STATUS_FAILED, HG_e_typecheck);
 	}
 	if (!force &&
 	    !hg_vm_quark_is_writable(vm, &qarray)) {
 		hg_debug(HG_MSGCAT_ARRAY, "No writable permission to access the array");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_invalidaccess);
 
-		return FALSE;
+		hg_error_return (HG_STATUS_FAILED, HG_e_invalidaccess);
 	}
 	a = _HG_VM_LOCK (vm, qarray);
 	if (!a)
@@ -3145,16 +3144,14 @@ hg_vm_array_get(hg_vm_t    *vm,
 
 	if (!HG_IS_QARRAY (qarray)) {
 		hg_debug(HG_MSGCAT_ARRAY, "Not an array");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_typecheck);
 
-		return Qnil;
+		hg_error_return_val (Qnil, HG_STATUS_FAILED, HG_e_typecheck);
 	}
 	if (!force &&
 	    !hg_vm_quark_is_readable(vm, &qarray)) {
 		hg_debug(HG_MSGCAT_ARRAY, "No readable permission to access the array");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_invalidaccess);
 
-		return Qnil;
+		hg_error_return_val (Qnil, HG_STATUS_FAILED, HG_e_invalidaccess);
 	}
 	a = _HG_VM_LOCK (vm, qarray);
 	if (!a)
@@ -3313,16 +3310,14 @@ hg_vm_dict_add(hg_vm_t    *vm,
 
 	if (!HG_IS_QDICT (qdict)) {
 		hg_debug(HG_MSGCAT_DICT, "Not a dict");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_typecheck);
 
-		return FALSE;
+		hg_error_return (HG_STATUS_FAILED, HG_e_typecheck);
 	}
 	if (!force &&
 	    !hg_vm_quark_is_writable(vm, &qdict)) {
 		hg_debug(HG_MSGCAT_DICT, "No writable permission to access the dict");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_invalidaccess);
 
-		return FALSE;
+		hg_error_return (HG_STATUS_FAILED, HG_e_invalidaccess);
 	}
 	d = _HG_VM_LOCK (vm, qdict);
 	if (!d)
@@ -3358,15 +3353,13 @@ hg_vm_dict_remove(hg_vm_t    *vm,
 
 	if (!HG_IS_QDICT (qdict)) {
 		hg_debug(HG_MSGCAT_DICT, "Not a dict");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_typecheck);
 
-		return FALSE;
+		hg_error_return (HG_STATUS_FAILED, HG_e_typecheck);
 	}
 	if (!hg_vm_quark_is_writable(vm, &qdict)) {
 		hg_debug(HG_MSGCAT_DICT, "No writable permission to access the dict");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_invalidaccess);
 
-		return FALSE;
+		hg_error_return (HG_STATUS_FAILED, HG_e_invalidaccess);
 	}
 	d = _HG_VM_LOCK (vm, qdict);
 	if (!d)
@@ -3404,16 +3397,14 @@ hg_vm_dict_lookup(hg_vm_t    *vm,
 
 	if (!HG_IS_QDICT (qdict)) {
 		hg_debug(HG_MSGCAT_DICT, "Not a dict");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_typecheck);
 
-		return Qnil;
+		hg_error_return_val (Qnil, HG_STATUS_FAILED, HG_e_typecheck);
 	}
 	if (check_perms &&
 	    !hg_vm_quark_is_readable(vm, &qdict)) {
 		hg_debug(HG_MSGCAT_DICT, "No readable permission to access the dict");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_invalidaccess);
 
-		return Qnil;
+		hg_error_return_val (Qnil, HG_STATUS_FAILED, HG_e_invalidaccess);
 	}
 	d = _HG_VM_LOCK (vm, qdict);
 	if (!d)
@@ -3602,8 +3593,8 @@ hg_vm_quark_to_string(hg_vm_t      *vm,
 		    default:
 			    hg_critical("Unknown simple object type: %d",
 					hg_quark_get_type(qdata));
-			    hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
-			    return Qnil;
+
+			    hg_error_return_val (Qnil, HG_STATUS_FAILED, HG_e_VMerror);
 		}
 	} else {
 		if (!hg_vm_quark_is_readable(vm, &qdata)) {
@@ -3646,8 +3637,8 @@ hg_vm_quark_to_string(hg_vm_t      *vm,
 			    default:
 				    hg_critical("Unknown complex object type: %d",
 						hg_quark_get_type(qdata));
-				    hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_VMerror);
-				    return Qnil;
+
+				    hg_error_return_val (Qnil, HG_STATUS_FAILED, HG_e_VMerror);
 			}
 		}
 	}
@@ -4025,8 +4016,7 @@ hg_vm_snapshot_save(hg_vm_t *vm)
 	_HG_VM_UNLOCK (vm, qgg);
 
 	if (!hg_stack_push(vm->stacks[HG_VM_STACK_GSTATE], qgg)) {
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_limitcheck);
-		return FALSE;
+		hg_error_return (HG_STATUS_FAILED, HG_e_limitcheck);
 	}
 	hg_vm_set_gstate(vm, qg);
 
@@ -4165,15 +4155,13 @@ hg_vm_string_get_cstr(hg_vm_t    *vm,
 
 	if (!HG_IS_QSTRING (qstring)) {
 		hg_debug(HG_MSGCAT_STRING, "Not a string");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_typecheck);
 
-		return NULL;
+		hg_error_return_val (NULL, HG_STATUS_FAILED, HG_e_typecheck);
 	}
 	if (!hg_vm_quark_is_readable(vm, &qstring)) {
 		hg_debug(HG_MSGCAT_STRING, "No readable permission to access the string");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_invalidaccess);
 
-		return NULL;
+		hg_error_return_val (NULL, HG_STATUS_FAILED, HG_e_invalidaccess);
 	}
 	s = _HG_VM_LOCK (vm, qstring);
 	if (!s)
@@ -4206,15 +4194,13 @@ hg_vm_string_length(hg_vm_t    *vm,
 
 	if (!HG_IS_QSTRING (qstring)) {
 		hg_debug(HG_MSGCAT_STRING, "Not a string");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_typecheck);
 
-		return 0;
+		hg_error_return_val (0, HG_STATUS_FAILED, HG_e_typecheck);
 	}
 	if (!hg_vm_quark_is_readable(vm, &qstring)) {
 		hg_debug(HG_MSGCAT_STRING, "No readable permission to access the string");
-		hg_errno = HG_ERROR_ (HG_STATUS_FAILED, HG_e_invalidaccess);
 
-		return 0;
+		hg_error_return_val (0, HG_STATUS_FAILED, HG_e_invalidaccess);
 	}
 	s = _HG_VM_LOCK (vm, qstring);
 	if (!s)