From 90c2739a9c01e24bd3300cc55b4d46dd7e42ae6c Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 30 Mar 2012 00:07:27 +0900 Subject: [PATCH] Renamed spdylay_frame.common as spdylay_frame.ctrl --- lib/includes/spdylay/spdylay.h | 2 +- lib/spdylay_outbound_item.h | 2 +- lib/spdylay_session.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/includes/spdylay/spdylay.h b/lib/includes/spdylay/spdylay.h index aee4038..09d1be8 100644 --- a/lib/includes/spdylay/spdylay.h +++ b/lib/includes/spdylay/spdylay.h @@ -714,7 +714,7 @@ typedef union { /** * Convenient structure to inspect control frame header. */ - spdylay_ctrl_frame common; + spdylay_ctrl_frame ctrl; /** * The SYN_STREAM control frame. */ diff --git a/lib/spdylay_outbound_item.h b/lib/spdylay_outbound_item.h index 5b85010..1206726 100644 --- a/lib/spdylay_outbound_item.h +++ b/lib/spdylay_outbound_item.h @@ -56,7 +56,7 @@ void spdylay_outbound_item_free(spdylay_outbound_item *item); /* Macros to cast spdylay_outbound_item.frame to the proper type. */ #define spdylay_outbound_item_get_ctrl_frame(ITEM) ((spdylay_frame*)ITEM->frame) #define spdylay_outbound_item_get_ctrl_frame_type(ITEM) \ - (((spdylay_frame*)ITEM->frame)->common.hd.type) + (((spdylay_frame*)ITEM->frame)->ctrl.hd.type) #define spdylay_outbound_item_get_data_frame(ITEM) ((spdylay_data*)ITEM->frame) #endif /* SPDYLAY_OUTBOUND_ITEM_H */ diff --git a/lib/spdylay_session.c b/lib/spdylay_session.c index e5aa05d..3a2953e 100644 --- a/lib/spdylay_session.c +++ b/lib/spdylay_session.c @@ -323,7 +323,7 @@ int spdylay_session_add_frame(spdylay_session *session, item->pri = spdylay_session_get_pri_lowest(session); if(frame_cat == SPDYLAY_CTRL) { spdylay_frame *frame = (spdylay_frame*)abs_frame; - spdylay_frame_type frame_type = frame->common.hd.type; + spdylay_frame_type frame_type = frame->ctrl.hd.type; switch(frame_type) { case SPDYLAY_SYN_STREAM: item->pri = frame->syn_stream.pri;