projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: liblttng-ust-ctl should check for incorrect parameters
[lttng-ust.git]
/
libringbuffer
/
shm.h
diff --git
a/libringbuffer/shm.h
b/libringbuffer/shm.h
index d102b8bf930c75ac40420a538f7cc13c0f5dab26..104eece6e6d1e4f4f3dc3943b9ce48fc84c28626 100644
(file)
--- a/
libringbuffer/shm.h
+++ b/
libringbuffer/shm.h
@@
-10,7
+10,7
@@
*/
#include <stdint.h>
*/
#include <stdint.h>
-#include <
lttng/
usterr-signal-safe.h>
+#include <usterr-signal-safe.h>
#include <urcu/compiler.h>
#include "shm_types.h"
#include <urcu/compiler.h>
#include "shm_types.h"
@@
-107,7
+107,7
@@
int shm_get_wait_fd(struct lttng_ust_shm_handle *handle, struct shm_ref *ref)
static inline
int shm_get_object_data(struct lttng_ust_shm_handle *handle, struct shm_ref *ref,
static inline
int shm_get_object_data(struct lttng_ust_shm_handle *handle, struct shm_ref *ref,
- int *
shm_fd, int *wait_fd, uint64_t
*memory_map_size)
+ int *
*shm_fd, int **wait_fd, uint64_t *
*memory_map_size)
{
struct shm_object_table *table = handle->table;
struct shm_object *obj;
{
struct shm_object_table *table = handle->table;
struct shm_object *obj;
@@
-117,9
+117,9
@@
int shm_get_object_data(struct lttng_ust_shm_handle *handle, struct shm_ref *ref
if (caa_unlikely(index >= table->allocated_len))
return -EPERM;
obj = &table->objects[index];
if (caa_unlikely(index >= table->allocated_len))
return -EPERM;
obj = &table->objects[index];
- *shm_fd = obj->shm_fd;
- *wait_fd = obj->wait_fd[0];
- *memory_map_size = obj->allocated_len;
+ *shm_fd =
&
obj->shm_fd;
+ *wait_fd =
&
obj->wait_fd[0];
+ *memory_map_size =
&
obj->allocated_len;
return 0;
}
return 0;
}
This page took
0.024 seconds
and
4
git commands to generate.