diff options
Diffstat (limited to 'plugins/pychrysalide/analysis/contents/module.c')
| -rw-r--r-- | plugins/pychrysalide/analysis/contents/module.c | 54 |
1 files changed, 29 insertions, 25 deletions
diff --git a/plugins/pychrysalide/analysis/contents/module.c b/plugins/pychrysalide/analysis/contents/module.c index 53fcdc8..d1650ac 100644 --- a/plugins/pychrysalide/analysis/contents/module.c +++ b/plugins/pychrysalide/analysis/contents/module.c @@ -32,29 +32,28 @@ #include "file.h" #include "memory.h" #include "restricted.h" -#include "../../access.h" +#include "../../helpers.h" /****************************************************************************** * * -* Paramètres : module = module dont la définition est à compléter. * +* Paramètres : super = module dont la définition est à compléter. * * * -* Description : Ajoute le module 'contents' au module Python. * +* Description : Ajoute le module 'analysis.contents' à un module Python. * * * -* Retour : - * +* Retour : Bilan de l'opération. * * * * Remarques : - * * * ******************************************************************************/ -bool add_analysis_contents_module_to_python_module(PyObject *super) +bool add_analysis_contents_module(PyObject *super) { bool result; /* Bilan à retourner */ PyObject *module; /* Sous-module mis en place */ - int ret; /* Bilan d'un appel */ - static PyModuleDef py_chrysalide_contents_module = { + static PyModuleDef py_chrysalide_analysis_contents_module = { .m_base = PyModuleDef_HEAD_INIT, @@ -65,32 +64,37 @@ bool add_analysis_contents_module_to_python_module(PyObject *super) }; - result = false; + module = build_python_module(super, &py_chrysalide_analysis_contents_module); - module = PyModule_Create(&py_chrysalide_contents_module); - if (module == NULL) return false; + result = (module != NULL); - ret = PyState_AddModule(super, &py_chrysalide_contents_module); - if (ret != 0) goto loading_failed; + return result; - ret = _PyImport_FixupBuiltin(module, "pychrysalide.analysis.contents"); - if (ret != 0) goto loading_failed; +} - Py_INCREF(module); - ret = PyModule_AddObject(super, "contents", module); - if (ret != 0) goto loading_failed; - result = true; +/****************************************************************************** +* * +* Paramètres : - * +* * +* Description : Intègre les objets du module 'analysis.contents'. * +* * +* Retour : Bilan de l'opération. * +* * +* Remarques : - * +* * +******************************************************************************/ - result &= register_python_encaps_content(module); - result &= register_python_file_content(module); - result &= register_python_memory_content(module); - result &= register_python_restricted_content(module); +bool populate_analysis_contents_module(void) +{ + bool result; /* Bilan à retourner */ - if (result) - register_access_to_python_module("pychrysalide.analysis.contents", module); + result = true; - loading_failed: + if (result) result = ensure_python_encaps_content_is_registered(); + if (result) result = ensure_python_file_content_is_registered(); + if (result) result = ensure_python_memory_content_is_registered(); + if (result) result = ensure_python_restricted_content_is_registered(); assert(result); |