diff options
Diffstat (limited to 'src/analysis/scan/core.c')
| -rw-r--r-- | src/analysis/scan/core.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/analysis/scan/core.c b/src/analysis/scan/core.c index 3b6c2c9..aef9abd 100644 --- a/src/analysis/scan/core.c +++ b/src/analysis/scan/core.c @@ -24,8 +24,8 @@ #include "core.h" -#include "funcs/datasize.h" -#include "funcs/uint.h" +#include "items/datasize.h" +#include "items/uint.h" @@ -47,20 +47,21 @@ bool populate_main_scan_namespace(GScanNamespace *space) result = true; -#define REGISTER_FUNC(s, f, n) \ +#define REGISTER_FUNC(s, f) \ ({ \ bool __result; \ - __result = g_scan_namespace_register(s, G_REGISTERED_ITEM(f), n); \ + __result = g_scan_namespace_register_item(s, G_REGISTERED_ITEM(f)); \ + g_object_unref(G_OBJECT(f)); \ __result; \ }) - if (result) result = REGISTER_FUNC(space, g_datasize_function_new(), "datasize"); - if (result) result = REGISTER_FUNC(space, g_datasize_function_new(), "filesize"); /* Alias */ + if (result) result = REGISTER_FUNC(space, g_datasize_function_new()); + //if (result) result = REGISTER_FUNC(space, g_datasize_function_new(), "filesize"); /* Alias */ - if (result) result = REGISTER_FUNC(space, g_uint_function_new(MDS_8_BITS_UNSIGNED), "uint8"); - if (result) result = REGISTER_FUNC(space, g_uint_function_new(MDS_16_BITS_UNSIGNED), "uint16"); - if (result) result = REGISTER_FUNC(space, g_uint_function_new(MDS_32_BITS_UNSIGNED), "uint32"); - if (result) result = REGISTER_FUNC(space, g_uint_function_new(MDS_64_BITS_UNSIGNED), "uint64"); + if (result) result = REGISTER_FUNC(space, g_uint_function_new(MDS_8_BITS_UNSIGNED)); + if (result) result = REGISTER_FUNC(space, g_uint_function_new(MDS_16_BITS_UNSIGNED)); + if (result) result = REGISTER_FUNC(space, g_uint_function_new(MDS_32_BITS_UNSIGNED)); + if (result) result = REGISTER_FUNC(space, g_uint_function_new(MDS_64_BITS_UNSIGNED)); return result; |