Use DIM(a) macro a few more times; array's dimension using sizeof.

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 6173be3..5a4e4b8 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -965,7 +965,7 @@ fmt_freecomptext(void)
     unsigned int i;
     struct comp *cm;
 
     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;
         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;
 
     else
        comp = comp->c_next;
 

-    while (comp == NULL && *bucket < sizeof(wantcomp)/sizeof(wantcomp[0])) {
+    while (comp == NULL && *bucket < DIM(wantcomp)) {

        comp = wantcomp[(*bucket)++];
     }
 
        comp = wantcomp[(*bucket)++];
     }
 


@@ -1118,7 +1118,7 @@ free_comptable(void)
     unsigned int i;
     struct comp *cm, *cm2;
 
     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;
        cm = wantcomp[i];
        while (cm != NULL) {
            cm2 = cm->c_next;

diff --git a/sbr/oauth_prof.c b/sbr/oauth_prof.c
index 7dbd4fd..ab1338e 100644 (file)
--- 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;
 
     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;
         if (strcmp(SERVICES[i].name, svc_name) == 0) {
             copy_svc(svcinfo, &SERVICES[i]);
             break;