projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: cppcheck linter cleanups
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.c
diff --git
a/src/bin/lttng-relayd/main.c
b/src/bin/lttng-relayd/main.c
index 41afccabdfa33b7e045b38a57a825d4d6246ab4b..4de6613a0eff3e8847d31cc65c90228cc467adf8 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-1273,14
+1273,16
@@
int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr,
if (data_buffer_size < data_size) {
/* In case the realloc fails, we can free the memory */
if (data_buffer_size < data_size) {
/* In case the realloc fails, we can free the memory */
- char *tmp_data_ptr = data_buffer;
- data_buffer = realloc(data_buffer, data_size);
- if (!data_buffer) {
+ char *tmp_data_ptr;
+
+ tmp_data_ptr = realloc(data_buffer, data_size);
+ if (!tmp_data_ptr) {
ERR("Allocating data buffer");
ERR("Allocating data buffer");
- free(
tmp_data_pt
r);
+ free(
data_buffe
r);
ret = -1;
goto end;
}
ret = -1;
goto end;
}
+ data_buffer = tmp_data_ptr;
data_buffer_size = data_size;
}
memset(data_buffer, 0, data_size);
data_buffer_size = data_size;
}
memset(data_buffer, 0, data_size);
@@
-1354,7
+1356,7
@@
int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
* structure considering that the other side will adapt.
*/
* structure considering that the other side will adapt.
*/
- ret = sscanf(VERSION, "%
u.%
u", &reply.major, &reply.minor);
+ ret = sscanf(VERSION, "%
10u.%10
u", &reply.major, &reply.minor);
if (ret < 2) {
ERR("Error in scanning version");
ret = -1;
if (ret < 2) {
ERR("Error in scanning version");
ret = -1;
@@
-1693,14
+1695,16
@@
int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht)
data_size = be32toh(data_hdr.data_size);
if (data_buffer_size < data_size) {
data_size = be32toh(data_hdr.data_size);
if (data_buffer_size < data_size) {
- char *tmp_data_ptr = data_buffer;
- data_buffer = realloc(data_buffer, data_size);
- if (!data_buffer) {
+ char *tmp_data_ptr;
+
+ tmp_data_ptr = realloc(data_buffer, data_size);
+ if (!tmp_data_ptr) {
ERR("Allocating data buffer");
ERR("Allocating data buffer");
- free(
tmp_data_pt
r);
+ free(
data_buffe
r);
ret = -1;
goto end_unlock;
}
ret = -1;
goto end_unlock;
}
+ data_buffer = tmp_data_ptr;
data_buffer_size = data_size;
}
memset(data_buffer, 0, data_size);
data_buffer_size = data_size;
}
memset(data_buffer, 0, data_size);
@@
-2054,7
+2058,7
@@
int main(int argc, char **argv)
/* Parse arguments */
progname = argv[0];
/* Parse arguments */
progname = argv[0];
- if ((ret = parse_args(argc, argv)
< 0)
) {
+ if ((ret = parse_args(argc, argv)
) < 0
) {
goto exit;
}
goto exit;
}
This page took
0.024725 seconds
and
4
git commands to generate.