From 97bb4983b53b2f67756b0b3cc800105e13bfcddb Mon Sep 17 00:00:00 2001 From: Ralph Corderoy Date: Mon, 29 May 2017 12:53:24 +0100 Subject: [PATCH] Use DIM(a) macro a few more times; array's dimension using sizeof. --- sbr/fmt_compile.c | 6 +++--- sbr/oauth_prof.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c index 6173be33..5a4e4b8b 100644 --- a/sbr/fmt_compile.c +++ b/sbr/fmt_compile.c @@ -965,7 +965,7 @@ fmt_freecomptext(void) unsigned int i; struct comp *cm; - for (i = 0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++) + for (i = 0; i < DIM(wantcomp); i++) for (cm = wantcomp[i]; cm; cm = cm->c_next) { mh_xfree(cm->c_text); cm->c_text = NULL; @@ -1101,7 +1101,7 @@ fmt_nextcomp(struct comp *comp, unsigned int *bucket) else comp = comp->c_next; - while (comp == NULL && *bucket < sizeof(wantcomp)/sizeof(wantcomp[0])) { + while (comp == NULL && *bucket < DIM(wantcomp)) { comp = wantcomp[(*bucket)++]; } @@ -1118,7 +1118,7 @@ free_comptable(void) unsigned int i; struct comp *cm, *cm2; - for (i = 0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++) { + for (i = 0; i < DIM(wantcomp); i++) { cm = wantcomp[i]; while (cm != NULL) { cm2 = cm->c_next; diff --git a/sbr/oauth_prof.c b/sbr/oauth_prof.c index 7dbd4fdb..ab1338e0 100644 --- a/sbr/oauth_prof.c +++ b/sbr/oauth_prof.c @@ -117,7 +117,7 @@ mh_oauth_get_service_info(const char *svc_name, mh_oauth_service_info *svcinfo, svcinfo->client_secret = svcinfo->auth_endpoint = NULL; svcinfo->token_endpoint = svcinfo->redirect_uri = NULL; - for (i = 0; i < (int) (sizeof SERVICES / sizeof SERVICES[0]); i++) { + for (i = 0; i < (int)DIM(SERVICES); i++) { if (strcmp(SERVICES[i].name, svc_name) == 0) { copy_svc(svcinfo, &SERVICES[i]); break; -- 2.56.0