Skip to content

Commit

Permalink
uci: eliminate usage of global variables
Browse files Browse the repository at this point in the history
Use the VM registry to store the last uci error code and lookup the uci
cursor resource type at resource creation time instead of caching it in
a global variable.

Signed-off-by: Jo-Philipp Wich <[email protected]>
  • Loading branch information
jow- committed Dec 11, 2024
1 parent 0b80ceb commit 175686c
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions lib/uci.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,15 @@

#include "ucode/module.h"

#define ok_return(expr) do { last_error = 0; return (expr); } while(0)
#define err_return(err) do { last_error = err; return NULL; } while(0)
#define ok_return(expr) do { \
uc_vm_registry_delete(vm, "uci.error"); \
return (expr); \
} while(0)

static int last_error = 0;
static uc_resource_type_t *cursor_type;
#define err_return(err) do { \
uc_vm_registry_set(vm, "uci.error", ucv_int64_new(err)); \
return NULL; \
} while(0)

enum pkg_cmd {
CMD_SAVE,
Expand Down Expand Up @@ -86,6 +90,7 @@ enum pkg_cmd {
static uc_value_t *
uc_uci_error(uc_vm_t *vm, size_t nargs)
{
int last_error = ucv_int64_get(uc_vm_registry_get(vm, "uci.error"));
char buf[sizeof("Unknown error: -9223372036854775808")];
uc_value_t *errmsg;

Expand All @@ -110,7 +115,7 @@ uc_uci_error(uc_vm_t *vm, size_t nargs)
errmsg = ucv_string_new(buf);
}

last_error = 0;
uc_vm_registry_delete(vm, "uci.error");

return errmsg;
}
Expand Down Expand Up @@ -179,7 +184,7 @@ uc_uci_cursor(uc_vm_t *vm, size_t nargs)
err_return(rv);
}

ok_return(uc_resource_new(cursor_type, c));
ok_return(ucv_resource_create(vm, "uci.cursor", c));
}


Expand Down Expand Up @@ -1868,5 +1873,5 @@ void uc_module_init(uc_vm_t *vm, uc_value_t *scope)
{
uc_function_list_register(scope, global_fns);

cursor_type = uc_type_declare(vm, "uci.cursor", cursor_fns, close_uci);
uc_type_declare(vm, "uci.cursor", cursor_fns, close_uci);
}

0 comments on commit 175686c

Please sign in to comment.