diff options
Diffstat (limited to 'modules/sensors/multihal.cpp')
| -rw-r--r-- | modules/sensors/multihal.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/sensors/multihal.cpp b/modules/sensors/multihal.cpp index 5fedd4d..48f2be3 100644 --- a/modules/sensors/multihal.cpp +++ b/modules/sensors/multihal.cpp @@ -36,6 +36,8 @@ #include <dlfcn.h> #include <SensorEventQueue.h> +#include <limits.h> +#include <stdlib.h> static const char* CONFIG_FILENAME = "/system/etc/sensors/hals.conf"; static const int MAX_CONF_LINE_LENGTH = 1024; @@ -488,14 +490,14 @@ static void lazy_init_modules() { pthread_mutex_unlock(&init_modules_mutex); return; } - std::vector<std::string> *so_paths = new std::vector<std::string>(); - get_so_paths(so_paths); + std::vector<std::string> so_paths; + get_so_paths(&so_paths); // dlopen the module files and cache their module symbols in sub_hw_modules sub_hw_modules = new std::vector<hw_module_t *>(); dlerror(); // clear any old errors const char* sym = HAL_MODULE_INFO_SYM_AS_STR; - for (std::vector<std::string>::iterator it = so_paths->begin(); it != so_paths->end(); it++) { + for (std::vector<std::string>::iterator it = so_paths.begin(); it != so_paths.end(); it++) { const char* path = it->c_str(); void* lib_handle = dlopen(path, RTLD_LAZY); if (lib_handle == NULL) { |