| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <200907241251.49556.isdn@linux-pingi.de>
Date: Fri, 24 Jul 2009 12:51:49 +0200
From: Karsten Keil <isdn@...ux-pingi.de>
To: Stoyan Gaydarov <sgayda2@...c.edu>
Cc: linux-kernel@...r.kernel.org
Subject: Re: [PATCH 2/7] [isdn] ARRAY_SIZE changes
Hi Stoyan,
On Mittwoch, 22. Juli 2009 05:02:28 Stoyan Gaydarov wrote:
> These changes were a direct result of using a semantic patch
> More information can be found at http://www.emn.fr/x-info/coccinelle/
>
> Signed-off-by: Stoyan Gaydarov <sgayda2@...c.edu>
Yes you are right, these defines should be rewritten to use
ARRAY_SIZE(), but in most cases the define is only used once,
so it would be better to replace it completely, I will prepare a new patch for
this stuff in drivers/isdn .
> ---
> drivers/isdn/act2000/capi.c | 2 +-
> drivers/isdn/act2000/module.c | 2 +-
> drivers/isdn/hardware/eicon/message.c | 2 +-
> drivers/isdn/hardware/eicon/os_4bri.c | 3 +--
> drivers/isdn/hisax/callc.c | 2 +-
> drivers/isdn/hisax/isdnl1.c | 6 +++---
> drivers/isdn/hisax/isdnl2.c | 2 +-
> drivers/isdn/hisax/isdnl3.c | 2 +-
> drivers/isdn/hisax/l3_1tr6.c | 9 +++------
> drivers/isdn/hisax/l3dss1.c | 12 ++++--------
> drivers/isdn/hisax/l3ni1.c | 12 ++++--------
> drivers/isdn/hisax/q931.c | 24 ++++++++++++------------
> drivers/isdn/hisax/tei.c | 2 +-
> 13 files changed, 34 insertions(+), 46 deletions(-)
>
> diff --git a/drivers/isdn/act2000/capi.c b/drivers/isdn/act2000/capi.c
> index 946c38c..a3428da 100644
> --- a/drivers/isdn/act2000/capi.c
> +++ b/drivers/isdn/act2000/capi.c
> @@ -78,7 +78,7 @@ static actcapi_msgdsc valid_msg[] = {
> #endif
> {{ 0x00, 0x00}, NULL},
> };
> -#define num_valid_msg (sizeof(valid_msg)/sizeof(actcapi_msgdsc))
> +#define num_valid_msg ARRAY_SIZE(valid_msg)
> #define num_valid_imsg 27 /* MANUFACTURER_IND */
>
> /*
> diff --git a/drivers/isdn/act2000/module.c b/drivers/isdn/act2000/module.c
> index 8325022..6387baa 100644
> --- a/drivers/isdn/act2000/module.c
> +++ b/drivers/isdn/act2000/module.c
> @@ -23,7 +23,7 @@ static unsigned short act2000_isa_ports[] =
> 0x0200, 0x0240, 0x0280, 0x02c0, 0x0300, 0x0340, 0x0380,
> 0xcfe0, 0xcfa0, 0xcf60, 0xcf20, 0xcee0, 0xcea0, 0xce60,
> };
> -#define ISA_NRPORTS (sizeof(act2000_isa_ports)/sizeof(unsigned short))
> +#define ISA_NRPORTS ARRAY_SIZE(act2000_isa_ports)
>
> static act2000_card *cards = (act2000_card *) NULL;
>
> diff --git a/drivers/isdn/hardware/eicon/message.c
> b/drivers/isdn/hardware/eicon/message.c index 31f91c1..9253209 100644
> --- a/drivers/isdn/hardware/eicon/message.c
> +++ b/drivers/isdn/hardware/eicon/message.c
> @@ -552,7 +552,7 @@ word api_put(APPL * appl, CAPI_MSG * msg)
>
> for(j=0;j<MAX_MSG_PARMS+1;j++) msg_parms[j].length = 0;
> for(i=0, ret = _BAD_MSG;
> - i<(sizeof(ftable)/sizeof(struct _ftable));
> + i<ARRAY_SIZE(ftable);
> i++) {
>
> if(ftable[i].command==msg->header.command) {
> diff --git a/drivers/isdn/hardware/eicon/os_4bri.c
> b/drivers/isdn/hardware/eicon/os_4bri.c index c964b8d..cb7616c 100644
> --- a/drivers/isdn/hardware/eicon/os_4bri.c
> +++ b/drivers/isdn/hardware/eicon/os_4bri.c
> @@ -149,8 +149,7 @@ int diva_4bri_init_card(diva_os_xdi_adapter_t * a)
> diva_os_xdi_adapter_t *diva_current;
> diva_os_xdi_adapter_t *adapter_list[4];
> PISDN_ADAPTER Slave;
> - unsigned long bar_length[sizeof(_4bri_bar_length) /
> - sizeof(_4bri_bar_length[0])];
> + unsigned long bar_length[ARRAY_SIZE(_4bri_bar_length)];
> int v2 = _4bri_is_rev_2_card(a->CardOrdinal);
> int tasks = _4bri_is_rev_2_bri_card(a->CardOrdinal) ? 1 :
> MQ_INSTANCE_COUNT; int factor = (tasks == 1) ? 1 : 2;
> diff --git a/drivers/isdn/hisax/callc.c b/drivers/isdn/hisax/callc.c
> index 025a20d..f90d6a6 100644
> --- a/drivers/isdn/hisax/callc.c
> +++ b/drivers/isdn/hisax/callc.c
> @@ -833,7 +833,7 @@ static struct FsmNode fnlist[] __initdata =
> };
> /* *INDENT-ON* */
>
> -#define FNCOUNT (sizeof(fnlist)/sizeof(struct FsmNode))
> +#define FNCOUNT ARRAY_SIZE(fnlist)
>
> int __init
> CallcNew(void)
> diff --git a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c
> index 317f16f..980e099 100644
> --- a/drivers/isdn/hisax/isdnl1.c
> +++ b/drivers/isdn/hisax/isdnl1.c
> @@ -647,7 +647,7 @@ static struct FsmNode L1SFnList[] __initdata =
> {ST_L1_F8, EV_TIMER_DEACT, l1_timer_deact},
> };
>
> -#define L1S_FN_COUNT (sizeof(L1SFnList)/sizeof(struct FsmNode))
> +#define L1S_FN_COUNT ARRAY_SIZE(L1SFnList)
>
> #ifdef HISAX_UINTERFACE
> static void
> @@ -706,7 +706,7 @@ static struct FsmNode L1UFnList[] __initdata =
> {ST_L1_RESET, EV_TIMER_DEACT, l1_timer_deact},
> };
>
> -#define L1U_FN_COUNT (sizeof(L1UFnList)/sizeof(struct FsmNode))
> +#define L1U_FN_COUNT ARRAY_SIZE(L1UFnList)
>
> #endif
>
> @@ -754,7 +754,7 @@ static struct FsmNode L1BFnList[] __initdata =
> {ST_L1_WAIT_DEACT, EV_TIMER_DEACT, l1b_timer_deact},
> };
>
> -#define L1B_FN_COUNT (sizeof(L1BFnList)/sizeof(struct FsmNode))
> +#define L1B_FN_COUNT ARRAY_SIZE(L1BFnList)
>
> int __init
> Isdnl1New(void)
> diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c
> index 3446f24..846a7e6 100644
> --- a/drivers/isdn/hisax/isdnl2.c
> +++ b/drivers/isdn/hisax/isdnl2.c
> @@ -1623,7 +1623,7 @@ static struct FsmNode L2FnList[] __initdata =
> {ST_L2_8, EV_L1_DEACTIVATE, l2_persistent_da},
> };
>
> -#define L2_FN_COUNT (sizeof(L2FnList)/sizeof(struct FsmNode))
> +#define L2_FN_COUNT ARRAY_SIZE(L2FnList)
>
> static void
> isdnl2_l1l2(struct PStack *st, int pr, void *arg)
> diff --git a/drivers/isdn/hisax/isdnl3.c b/drivers/isdn/hisax/isdnl3.c
> index 935f233..c081fed 100644
> --- a/drivers/isdn/hisax/isdnl3.c
> +++ b/drivers/isdn/hisax/isdnl3.c
> @@ -543,7 +543,7 @@ static struct FsmNode L3FnList[] __initdata =
> };
> /* *INDENT-ON* */
>
> -#define L3_FN_COUNT (sizeof(L3FnList)/sizeof(struct FsmNode))
> +#define L3_FN_COUNT ARRAY_SIZE(L3FnList)
>
> void
> l3_msg(struct PStack *st, int pr, void *arg)
> diff --git a/drivers/isdn/hisax/l3_1tr6.c b/drivers/isdn/hisax/l3_1tr6.c
> index c5c36ee..ff62679 100644
> --- a/drivers/isdn/hisax/l3_1tr6.c
> +++ b/drivers/isdn/hisax/l3_1tr6.c
> @@ -698,8 +698,7 @@ static struct stateentry downstl[] =
> CC_T308_2, l3_1tr6_t308_2},
> };
>
> -#define DOWNSTL_LEN \
> - (sizeof(downstl) / sizeof(struct stateentry))
> +#define DOWNSTL_LEN ARRAY_SIZE(downstl)
>
> static struct stateentry datastln1[] =
> {
> @@ -735,8 +734,7 @@ static struct stateentry datastln1[] =
> MT_N1_REL_ACK, l3_1tr6_rel_ack}
> };
>
> -#define DATASTLN1_LEN \
> - (sizeof(datastln1) / sizeof(struct stateentry))
> +#define DATASTLN1_LEN ARRAY_SIZE(datastln1)
>
> static struct stateentry manstatelist[] =
> {
> @@ -746,8 +744,7 @@ static struct stateentry manstatelist[] =
> DL_RELEASE | INDICATION, l3_1tr6_dl_release},
> };
>
> -#define MANSLLEN \
> - (sizeof(manstatelist) / sizeof(struct stateentry))
> +#define MANSLLEN ARRAY_SIZE(manstatelist)
> /* *INDENT-ON* */
>
> static void
> diff --git a/drivers/isdn/hisax/l3dss1.c b/drivers/isdn/hisax/l3dss1.c
> index 99feae8..c434fa5 100644
> --- a/drivers/isdn/hisax/l3dss1.c
> +++ b/drivers/isdn/hisax/l3dss1.c
> @@ -2820,8 +2820,7 @@ static struct stateentry downstatelist[] =
> CC_T309, l3dss1_dl_release},
> };
>
> -#define DOWNSLLEN \
> - (sizeof(downstatelist) / sizeof(struct stateentry))
> +#define DOWNSLLEN ARRAY_SIZE(downstatelist)
>
> static struct stateentry datastatelist[] =
> {
> @@ -2875,8 +2874,7 @@ static struct stateentry datastatelist[] =
> MT_RESUME_REJECT, l3dss1_resume_rej},
> };
>
> -#define DATASLLEN \
> - (sizeof(datastatelist) / sizeof(struct stateentry))
> +#define DATASLLEN ARRAY_SIZE(datastatelist)
>
> static struct stateentry globalmes_list[] =
> {
> @@ -2888,8 +2886,7 @@ static struct stateentry globalmes_list[] =
> MT_RESTART_ACKNOWLEDGE, l3dss1_restart_ack},
> */
> };
> -#define GLOBALM_LEN \
> - (sizeof(globalmes_list) / sizeof(struct stateentry))
> +#define GLOBALM_LEN ARRAY_SIZE(globalmes_list)
>
> static struct stateentry manstatelist[] =
> {
> @@ -2903,8 +2900,7 @@ static struct stateentry manstatelist[] =
> DL_RELEASE | INDICATION, l3dss1_dl_release},
> };
>
> -#define MANSLLEN \
> - (sizeof(manstatelist) / sizeof(struct stateentry))
> +#define MANSLLEN ARRAY_SIZE(manstatelist)
> /* *INDENT-ON* */
>
>
> diff --git a/drivers/isdn/hisax/l3ni1.c b/drivers/isdn/hisax/l3ni1.c
> index f7041d5..ba05ae3 100644
> --- a/drivers/isdn/hisax/l3ni1.c
> +++ b/drivers/isdn/hisax/l3ni1.c
> @@ -2755,8 +2755,7 @@ static struct stateentry downstatelist[] =
> CC_TSPID, l3ni1_spid_tout },
> };
>
> -#define DOWNSLLEN \
> - (sizeof(downstatelist) / sizeof(struct stateentry))
> +#define DOWNSLLEN ARRAY_SIZE(downstatelist)
>
> static struct stateentry datastatelist[] =
> {
> @@ -2810,8 +2809,7 @@ static struct stateentry datastatelist[] =
> MT_RESUME_REJECT, l3ni1_resume_rej},
> };
>
> -#define DATASLLEN \
> - (sizeof(datastatelist) / sizeof(struct stateentry))
> +#define DATASLLEN ARRAY_SIZE(datastatelist)
>
> static struct stateentry globalmes_list[] =
> {
> @@ -2825,8 +2823,7 @@ static struct stateentry globalmes_list[] =
> { SBIT( 0 ), MT_DL_ESTABLISHED, l3ni1_spid_send },
> { SBIT( 20 ) | SBIT( 21 ) | SBIT( 22 ), MT_INFORMATION, l3ni1_spid_epid
> }, };
> -#define GLOBALM_LEN \
> - (sizeof(globalmes_list) / sizeof(struct stateentry))
> +#define GLOBALM_LEN ARRAY_SIZE(globalmes_list)
>
> static struct stateentry manstatelist[] =
> {
> @@ -2840,8 +2837,7 @@ static struct stateentry manstatelist[] =
> DL_RELEASE | INDICATION, l3ni1_dl_release},
> };
>
> -#define MANSLLEN \
> - (sizeof(manstatelist) / sizeof(struct stateentry))
> +#define MANSLLEN ARRAY_SIZE(manstatelist)
> /* *INDENT-ON* */
>
>
> diff --git a/drivers/isdn/hisax/q931.c b/drivers/isdn/hisax/q931.c
> index aacbf0d..8b853d5 100644
> --- a/drivers/isdn/hisax/q931.c
> +++ b/drivers/isdn/hisax/q931.c
> @@ -140,7 +140,7 @@ struct MessageType {
> }
> };
>
> -#define MTSIZE sizeof(mtlist)/sizeof(struct MessageType)
> +#define MTSIZE ARRAY_SIZE(mtlist)
>
> static
> struct MessageType mt_n0[] =
> @@ -157,7 +157,7 @@ struct MessageType mt_n0[] =
> {MT_N0_CLO_ACK, "CLOse ACKnowledge"}
> };
>
> -#define MT_N0_LEN (sizeof(mt_n0) / sizeof(struct MessageType))
> +#define MT_N0_LEN ARRAY_SIZE(mt_n0)
>
> static
> struct MessageType mt_n1[] =
> @@ -194,7 +194,7 @@ struct MessageType mt_n1[] =
> {MT_N1_STAT, "STATus"}
> };
>
> -#define MT_N1_LEN (sizeof(mt_n1) / sizeof(struct MessageType))
> +#define MT_N1_LEN ARRAY_SIZE(mt_n1)
>
>
> static int
> @@ -438,7 +438,7 @@ struct CauseValue {
> },
> };
>
> -#define CVSIZE sizeof(cvlist)/sizeof(struct CauseValue)
> +#define CVSIZE ARRAY_SIZE(cvlist)
>
> static
> int
> @@ -516,7 +516,7 @@ struct MessageType cause_1tr6[] =
> {CAUSE_UserInfoDiscarded, "User Info Discarded"}
> };
>
> -static int cause_1tr6_len = (sizeof(cause_1tr6) / sizeof(struct
> MessageType)); +static int cause_1tr6_len = ARRAY_SIZE(cause_1tr6);
>
> static int
> prcause_1tr6(char *dest, u_char * p)
> @@ -865,7 +865,7 @@ struct DTag { /* Display tags */
> { 0x96, "Redirection name" },
> { 0x9e, "Text" },
> };
> -#define DTAGSIZE sizeof(dtaglist)/sizeof(struct DTag)
> +#define DTAGSIZE ARRAY_SIZE(dtaglist)
>
> static int
> disptext_ni1(char *dest, u_char * p)
> @@ -1074,7 +1074,7 @@ struct InformationElement {
> };
>
>
> -#define IESIZE sizeof(ielist)/sizeof(struct InformationElement)
> +#define IESIZE ARRAY_SIZE(ielist)
>
> static
> struct InformationElement ielist_ni1[] = {
> @@ -1102,7 +1102,7 @@ struct InformationElement ielist_ni1[] = {
> };
>
>
> -#define IESIZE_NI1 sizeof(ielist_ni1)/sizeof(struct InformationElement)
> +#define IESIZE_NI1 ARRAY_SIZE(ielist_ni1)
>
> static
> struct InformationElement ielist_ni1_cs5[] = {
> @@ -1110,14 +1110,14 @@ struct InformationElement ielist_ni1_cs5[] = {
> { 0x2a, "Display text", disptext_ni1 },
> };
>
> -#define IESIZE_NI1_CS5 sizeof(ielist_ni1_cs5)/sizeof(struct
> InformationElement) +#define IESIZE_NI1_CS5 ARRAY_SIZE(ielist_ni1_cs5)
>
> static
> struct InformationElement ielist_ni1_cs6[] = {
> { 0x7b, "Call appearance", general_ni1 },
> };
>
> -#define IESIZE_NI1_CS6 sizeof(ielist_ni1_cs6)/sizeof(struct
> InformationElement) +#define IESIZE_NI1_CS6 ARRAY_SIZE(ielist_ni1_cs6)
>
> static struct InformationElement we_0[] =
> {
> @@ -1133,7 +1133,7 @@ static struct InformationElement we_0[] =
> {WE0_userInfo, "User Info", general}
> };
>
> -#define WE_0_LEN (sizeof(we_0) / sizeof(struct InformationElement))
> +#define WE_0_LEN ARRAY_SIZE(we_0)
>
> static struct InformationElement we_6[] =
> {
> @@ -1145,7 +1145,7 @@ static struct InformationElement we_6[] =
> {WE6_statusCalled, "Status Called", general},
> {WE6_addTransAttr, "Additional Transmission Attributes", general}
> };
> -#define WE_6_LEN (sizeof(we_6) / sizeof(struct InformationElement))
> +#define WE_6_LEN ARRAY_SIZE(we_6)
>
> int
> QuickHex(char *txt, u_char * p, int cnt)
> diff --git a/drivers/isdn/hisax/tei.c b/drivers/isdn/hisax/tei.c
> index ceb0df9..21567af 100644
> --- a/drivers/isdn/hisax/tei.c
> +++ b/drivers/isdn/hisax/tei.c
> @@ -447,7 +447,7 @@ static struct FsmNode TeiFnList[] __initdata =
> {ST_TEI_IDVERIFY, EV_CHKREQ, tei_id_chk_req},
> };
>
> -#define TEI_FN_COUNT (sizeof(TeiFnList)/sizeof(struct FsmNode))
> +#define TEI_FN_COUNT ARRAY_SIZE(TeiFnList)
>
> int __init
> TeiNew(void)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists