aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <mschanzenbach@posteo.de>2021-05-15 18:26:20 +0200
committerMartin Schanzenbach <mschanzenbach@posteo.de>2021-05-15 18:26:20 +0200
commitab49acfccf8b3d5f5f48aaad990417b031db1067 (patch)
treea3966f9df8b614f4a796e627bd05f5bb7c38b222
parent765fa87ed79537ec7ea497bc670200e09aa20e0d (diff)
downloadgnunet-ab49acfccf8b3d5f5f48aaad990417b031db1067.tar.gz
gnunet-ab49acfccf8b3d5f5f48aaad990417b031db1067.zip
-coverity; do not use assertion for actual code -- bad style
-rw-r--r--src/arm/arm_api.c27
1 files changed, 13 insertions, 14 deletions
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index 2ec913a0a..0bffbc26d 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -433,12 +433,10 @@ handle_arm_list_result (void *cls,
433 const char *name; 433 const char *name;
434 const char *binary; 434 const char *binary;
435 435
436 GNUNET_assert (NULL != (name = pool_get (pool_start, 436 name = pool_get (pool_start, pool_size, name_index);
437 pool_size, 437 binary = pool_get (pool_start, pool_size, binary_index);
438 name_index))); 438 GNUNET_assert (NULL != name);
439 GNUNET_assert (NULL != (binary = pool_get (pool_start, 439 GNUNET_assert (NULL != binary);
440 pool_size,
441 binary_index)));
442 list[i] = (struct GNUNET_ARM_ServiceInfo) { 440 list[i] = (struct GNUNET_ARM_ServiceInfo) {
443 .name = name, 441 .name = name,
444 .binary = binary, 442 .binary = binary,
@@ -978,15 +976,16 @@ GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h,
978 { 976 {
979 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, 977 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
980 "pipe"); 978 "pipe");
981 } 979 } else {
982 wsig = GNUNET_DISK_pipe_detach_end (sig, 980 wsig = GNUNET_DISK_pipe_detach_end (sig,
983 GNUNET_DISK_PIPE_END_WRITE); 981 GNUNET_DISK_PIPE_END_WRITE);
984 ret = start_arm_service (h, 982 ret = start_arm_service (h,
985 std_inheritance, 983 std_inheritance,
986 wsig); 984 wsig);
987 GNUNET_DISK_file_close (wsig); 985 GNUNET_DISK_file_close (wsig);
988 if (GNUNET_ARM_RESULT_STARTING == ret) 986 if (GNUNET_ARM_RESULT_STARTING == ret)
989 reconnect_arm (h); 987 reconnect_arm (h);
988 }
990 op = GNUNET_new (struct GNUNET_ARM_Operation); 989 op = GNUNET_new (struct GNUNET_ARM_Operation);
991 op->h = h; 990 op->h = h;
992 op->result_cont = cont; 991 op->result_cont = cont;