]> git.proxmox.com Git - mirror_frr.git/commitdiff
lib: Remove unneeded asserts in mgmt code
authorDonald Sharp <sharpd@nvidia.com>
Mon, 27 Mar 2023 12:08:36 +0000 (08:08 -0400)
committerDonald Sharp <sharpd@nvidia.com>
Mon, 27 Mar 2023 12:08:36 +0000 (08:08 -0400)
event_add_XXXX functions have no failure path where
if you pass in a double event pointer that it could
return without setting the pointer.  As such these
asserts make no sense and are unnecessary

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
lib/mgmt_be_client.c
lib/mgmt_fe_client.c

index c35399cb5a7fa0c25304371135dc9b4edcbc702f..36c78052bcfaf9b9c3244d70ce35b24f2aa3d2ee 100644 (file)
@@ -1056,26 +1056,22 @@ mgmt_be_client_register_event(struct mgmt_be_client_ctx *client_ctx,
                event_add_read(client_ctx->tm, mgmt_be_client_read,
                                client_ctx, client_ctx->conn_fd,
                                &client_ctx->conn_read_ev);
-               assert(client_ctx->conn_read_ev);
                break;
        case MGMTD_BE_CONN_WRITE:
                event_add_write(client_ctx->tm, mgmt_be_client_write,
                                 client_ctx, client_ctx->conn_fd,
                                 &client_ctx->conn_write_ev);
-               assert(client_ctx->conn_write_ev);
                break;
        case MGMTD_BE_PROC_MSG:
                tv.tv_usec = MGMTD_BE_MSG_PROC_DELAY_USEC;
                event_add_timer_tv(client_ctx->tm, mgmt_be_client_proc_msgbufs,
                                    client_ctx, &tv, &client_ctx->msg_proc_ev);
-               assert(client_ctx->msg_proc_ev);
                break;
        case MGMTD_BE_CONN_WRITES_ON:
                event_add_timer_msec(client_ctx->tm,
                                      mgmt_be_client_resume_writes, client_ctx,
                                      MGMTD_BE_MSG_WRITE_DELAY_MSEC,
                                      &client_ctx->conn_writes_on);
-               assert(client_ctx->conn_writes_on);
                break;
        case MGMTD_BE_SERVER:
        case MGMTD_BE_CONN_INIT:
index 57c1961ff0af815b11406a8ad534eac917fbb208..a2c4fd6572a75878ead0f242491b7d6ac38d0bea 100644 (file)
@@ -741,27 +741,23 @@ mgmt_fe_client_register_event(struct mgmt_fe_client_ctx *client_ctx,
                event_add_read(client_ctx->tm, mgmt_fe_client_read,
                                client_ctx, client_ctx->conn_fd,
                                &client_ctx->conn_read_ev);
-               assert(client_ctx->conn_read_ev);
                break;
        case MGMTD_FE_CONN_WRITE:
                event_add_write(client_ctx->tm, mgmt_fe_client_write,
                                 client_ctx, client_ctx->conn_fd,
                                 &client_ctx->conn_write_ev);
-               assert(client_ctx->conn_write_ev);
                break;
        case MGMTD_FE_PROC_MSG:
                tv.tv_usec = MGMTD_FE_MSG_PROC_DELAY_USEC;
                event_add_timer_tv(client_ctx->tm,
                                    mgmt_fe_client_proc_msgbufs, client_ctx,
                                    &tv, &client_ctx->msg_proc_ev);
-               assert(client_ctx->msg_proc_ev);
                break;
        case MGMTD_FE_CONN_WRITES_ON:
                event_add_timer_msec(
                        client_ctx->tm, mgmt_fe_client_resume_writes,
                        client_ctx, MGMTD_FE_MSG_WRITE_DELAY_MSEC,
                        &client_ctx->conn_writes_on);
-               assert(client_ctx->conn_writes_on);
                break;
        case MGMTD_FE_SERVER:
                assert(!"mgmt_fe_client_ctx_post_event called incorrectly");