zebra: use frr mem apis

Replace a couple of strdup/free with XSTRDUP/XFREE.

Signed-off-by: Mark Stapp <mstapp@nvidia.com>
This commit is contained in:
Mark Stapp 2022-02-08 15:57:57 -05:00
parent 8dd61ca240
commit b6b6e59c6e

View File

@ -722,7 +722,7 @@ static void dplane_ctx_free_internal(struct zebra_dplane_ctx *ctx)
/* Maybe free label string, if allocated */ /* Maybe free label string, if allocated */
if (ctx->u.intf.label != NULL && if (ctx->u.intf.label != NULL &&
ctx->u.intf.label != ctx->u.intf.label_buf) { ctx->u.intf.label != ctx->u.intf.label_buf) {
free(ctx->u.intf.label); XFREE(MTYPE_DP_CTX, ctx->u.intf.label);
ctx->u.intf.label = NULL; ctx->u.intf.label = NULL;
} }
break; break;
@ -1843,7 +1843,7 @@ void dplane_ctx_set_intf_label(struct zebra_dplane_ctx *ctx, const char *label)
DPLANE_CTX_VALID(ctx); DPLANE_CTX_VALID(ctx);
if (ctx->u.intf.label && ctx->u.intf.label != ctx->u.intf.label_buf) if (ctx->u.intf.label && ctx->u.intf.label != ctx->u.intf.label_buf)
free(ctx->u.intf.label); XFREE(MTYPE_DP_CTX, ctx->u.intf.label);
ctx->u.intf.label = NULL; ctx->u.intf.label = NULL;
@ -1858,7 +1858,7 @@ void dplane_ctx_set_intf_label(struct zebra_dplane_ctx *ctx, const char *label)
sizeof(ctx->u.intf.label_buf)); sizeof(ctx->u.intf.label_buf));
ctx->u.intf.label = ctx->u.intf.label_buf; ctx->u.intf.label = ctx->u.intf.label_buf;
} else { } else {
ctx->u.intf.label = strdup(label); ctx->u.intf.label = XSTRDUP(MTYPE_DP_CTX, label);
} }
} else { } else {
ctx->u.intf.flags &= ~DPLANE_INTF_HAS_LABEL; ctx->u.intf.flags &= ~DPLANE_INTF_HAS_LABEL;
@ -3694,7 +3694,7 @@ static enum zebra_dplane_result intf_addr_update_internal(
sizeof(ctx->u.intf.label_buf)); sizeof(ctx->u.intf.label_buf));
ctx->u.intf.label = ctx->u.intf.label_buf; ctx->u.intf.label = ctx->u.intf.label_buf;
} else { } else {
ctx->u.intf.label = strdup(ifc->label); ctx->u.intf.label = XSTRDUP(MTYPE_DP_CTX, ifc->label);
} }
} }