From 4af64c961286980bda0acd2fbca7ade6cc9e5a1e Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Tue, 6 Sep 2011 13:33:48 +0000 Subject: [PATCH] bfcp: rename stat to rstat, to avoid name clash with 'stat' --- include/re_bfcp.h | 2 +- src/bfcp/msg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/re_bfcp.h b/include/re_bfcp.h index 7de1f97..8690e12 100644 --- a/include/re_bfcp.h +++ b/include/re_bfcp.h @@ -203,7 +203,7 @@ const struct sa *bfcp_msg_src(const struct bfcp_msg *msg); const char *bfcp_prim_name(enum bfcp_prim prim); const char *bfcp_attr_name(enum bfcp_attrib attr); -const char *bfcp_reqstat_name(enum bfcp_rstat stat); +const char *bfcp_reqstat_name(enum bfcp_rstat rstat); const char *bfcp_errcode_name(enum bfcp_err code); diff --git a/src/bfcp/msg.c b/src/bfcp/msg.c index c931b68..9b97188 100644 --- a/src/bfcp/msg.c +++ b/src/bfcp/msg.c @@ -207,9 +207,9 @@ uint16_t bfcp_msg_userid(const struct bfcp_msg *msg) } -const char *bfcp_reqstat_name(enum bfcp_rstat stat) +const char *bfcp_reqstat_name(enum bfcp_rstat rstat) { - switch (stat) { + switch (rstat) { case BFCP_PENDING: return "Pending"; case BFCP_ACCEPTED: return "Accepted";