Commit 9ae3cc37 authored by sbc's avatar sbc Committed by Commit bot

[NaCl SDK] nacl_io: add return value to nacl_io_init.

The underlying ki_init functions were returning
their success but for some reason nacl_io_init was
ignoring this and returning void.

Review URL: https://codereview.chromium.org/598223004

Cr-Commit-Position: refs/heads/master@{#296752}
parent 15daa893
...@@ -110,8 +110,12 @@ int ki_is_initialized() { ...@@ -110,8 +110,12 @@ int ki_is_initialized() {
return s_state.kp != NULL; return s_state.kp != NULL;
} }
void ki_uninit() { int ki_uninit() {
LOG_TRACE("ki_uninit"); LOG_TRACE("ki_uninit");
assert(s_state.kp);
if (s_state.kp == NULL)
return 1;
if (s_saved_state.kp == NULL) if (s_saved_state.kp == NULL)
kernel_wrap_uninit(); kernel_wrap_uninit();
...@@ -125,6 +129,7 @@ void ki_uninit() { ...@@ -125,6 +129,7 @@ void ki_uninit() {
delete state_to_delete.kp; delete state_to_delete.kp;
delete state_to_delete.ppapi; delete state_to_delete.ppapi;
return 0;
} }
nacl_io::KernelProxy* ki_get_proxy() { nacl_io::KernelProxy* ki_get_proxy() {
......
...@@ -65,7 +65,7 @@ nacl_io::KernelProxy* ki_get_proxy(); ...@@ -65,7 +65,7 @@ nacl_io::KernelProxy* ki_get_proxy();
#endif #endif
int ki_is_initialized(void); int ki_is_initialized(void);
void ki_uninit(void); int ki_uninit(void);
int ki_chdir(const char* path); int ki_chdir(const char* path);
void ki_exit(int status); void ki_exit(int status);
......
...@@ -8,16 +8,16 @@ ...@@ -8,16 +8,16 @@
#include "nacl_io/kernel_intercept.h" #include "nacl_io/kernel_intercept.h"
#include "nacl_io/kernel_proxy.h" #include "nacl_io/kernel_proxy.h"
void nacl_io_init() { int nacl_io_init() {
ki_init(NULL); return ki_init(NULL);
} }
void nacl_io_uninit() { int nacl_io_uninit() {
ki_uninit(); return ki_uninit();
} }
void nacl_io_init_ppapi(PP_Instance instance, PPB_GetInterface get_interface) { int nacl_io_init_ppapi(PP_Instance instance, PPB_GetInterface get_interface) {
ki_init_ppapi(NULL, instance, get_interface); return ki_init_ppapi(NULL, instance, get_interface);
} }
int nacl_io_register_fs_type(const char* fs_type, fuse_operations* fuse_ops) { int nacl_io_register_fs_type(const char* fs_type, fuse_operations* fuse_ops) {
......
...@@ -29,7 +29,7 @@ typedef void (*nacl_io_mount_callback_t)(const char* source, ...@@ -29,7 +29,7 @@ typedef void (*nacl_io_mount_callback_t)(const char* source,
* NOTE: If you initialize nacl_io with this constructor, you cannot * NOTE: If you initialize nacl_io with this constructor, you cannot
* use any filesystems that require PPAPI; e.g. persistent storage, etc. * use any filesystems that require PPAPI; e.g. persistent storage, etc.
*/ */
void nacl_io_init(); int nacl_io_init();
/** /**
* Initialize nacl_io with PPAPI support. * Initialize nacl_io with PPAPI support.
...@@ -49,7 +49,7 @@ void nacl_io_init(); ...@@ -49,7 +49,7 @@ void nacl_io_init();
* |get_interface| can be retrieved via * |get_interface| can be retrieved via
* pp::Module::Get()->get_browser_interface() * pp::Module::Get()->get_browser_interface()
*/ */
void nacl_io_init_ppapi(PP_Instance instance, PPB_GetInterface get_interface); int nacl_io_init_ppapi(PP_Instance instance, PPB_GetInterface get_interface);
/** /**
* Uninitialize nacl_io. * Uninitialize nacl_io.
...@@ -57,7 +57,7 @@ void nacl_io_init_ppapi(PP_Instance instance, PPB_GetInterface get_interface); ...@@ -57,7 +57,7 @@ void nacl_io_init_ppapi(PP_Instance instance, PPB_GetInterface get_interface);
* This removes interception for POSIX C-library function and releases * This removes interception for POSIX C-library function and releases
* any associated resources. * any associated resources.
*/ */
void nacl_io_uninit(); int nacl_io_uninit();
void nacl_io_set_exit_callback(nacl_io_exit_callback_t exit_callback, void nacl_io_set_exit_callback(nacl_io_exit_callback_t exit_callback,
void* user_data); void* user_data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment