From 97243f0e30c13beae372bc737365d9fd332bfb20 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 2 Mar 2015 17:22:07 +0000
Subject: [PATCH] Clean up C example

---
 tests/index.c | 162 +++++++++++++++++++++++++-------------------------
 1 file changed, 80 insertions(+), 82 deletions(-)

diff --git a/tests/index.c b/tests/index.c
index 5bf696019..2aa6c421a 100644
--- a/tests/index.c
+++ b/tests/index.c
@@ -20,9 +20,9 @@ int main(int argc,char* argv[])
     grib_handle* h=NULL;
     char* infile=NULL;
     char* outfile=NULL;
-    long *step,*level,*number;
+    long *steps,*levels,*numbers; /* arrays */
     char** shortName=NULL;
-    int i,j,k,l,iii;
+    int i,j,k,l;
     size_t stepSize,levelSize,shortNameSize,numberSize;
     long ostep,olevel,onumber;
     char oshortName[200];
@@ -35,104 +35,102 @@ int main(int argc,char* argv[])
 
     printf("indexing...\n");
 
-    for (iii=0;iii<1;iii++) {
-        /* Create an index given set of keys*/
-        index=grib_index_new(0,"shortName,level,number,step",&ret);
-        if (ret) {printf("error: %s\n",grib_get_error_message(ret)); exit(ret);}
+    /* Create an index given set of keys*/
+    index=grib_index_new(0,"shortName,level,number,step",&ret);
+    if (ret) {printf("error: %s\n",grib_get_error_message(ret)); exit(ret);}
 
-        /* Indexes a file */
-        ret=grib_index_add_file(index,infile);
-        if (ret) {printf("error: %s\n",grib_get_error_message(ret)); exit(ret);}
-        printf("end indexing...\n");
+    /* Indexes a file */
+    ret=grib_index_add_file(index,infile);
+    if (ret) {printf("error: %s\n",grib_get_error_message(ret)); exit(ret);}
+    printf("end indexing...\n");
 
-        /* get the number of distinct values of "step" in the index */
-        GRIB_CHECK(grib_index_get_size(index,"step",&stepSize),0);
-        step=(long*)malloc(sizeof(long)*stepSize);
-        if (!step) exit(1);
-        /* get the list of distinct steps from the index */
-        /* the list is in ascending order */
-        GRIB_CHECK(grib_index_get_long(index,"step",step,&stepSize),0);
-        printf("stepSize=%ld\n",(long)stepSize);
-        for (i=0;i<stepSize;i++) printf("%ld ",step[i]);
-        printf("\n");
+    /* get the number of distinct values of "step" in the index */
+    GRIB_CHECK(grib_index_get_size(index,"step",&stepSize),0);
+    steps=(long*)malloc(sizeof(long)*stepSize);
+    if (!steps) exit(1);
+    /* get the list of distinct steps from the index */
+    /* the list is in ascending order */
+    GRIB_CHECK(grib_index_get_long(index,"step",steps,&stepSize),0);
+    printf("stepSize=%ld\n",(long)stepSize);
+    for (i=0;i<stepSize;i++) printf("%ld ",steps[i]);
+    printf("\n");
 
-        /*same as for "step"*/
-        GRIB_CHECK(grib_index_get_size(index,"level",&levelSize),0);
-        level=(long*)malloc(sizeof(long)*levelSize);
-        if (!level) exit(1);
-        /*same as for "step"*/
-        GRIB_CHECK(grib_index_get_long(index,"level",level,&levelSize),0);
-        printf("levelSize=%ld\n",(long)levelSize);
-        for (i=0;i<levelSize;i++) printf("%ld ",level[i]);
-        printf("\n");
+    /*same as for "step"*/
+    GRIB_CHECK(grib_index_get_size(index,"level",&levelSize),0);
+    levels=(long*)malloc(sizeof(long)*levelSize);
+    if (!levels) exit(1);
+    /*same as for "step"*/
+    GRIB_CHECK(grib_index_get_long(index,"level",levels,&levelSize),0);
+    printf("levelSize=%ld\n",(long)levelSize);
+    for (i=0;i<levelSize;i++) printf("%ld ",levels[i]);
+    printf("\n");
 
-        /*same as for "step"*/
-        GRIB_CHECK(grib_index_get_size(index,"number",&numberSize),0);
-        number=(long*)malloc(sizeof(long)*numberSize);
-        if (!number) exit(1);
-        /*same as for "step"*/
-        GRIB_CHECK(grib_index_get_long(index,"number",number,&numberSize),0);
-        printf("numberSize=%ld\n",(long)numberSize);
-        for (i=0;i<numberSize;i++) printf("%ld ",number[i]);
-        printf("\n");
+    /*same as for "step"*/
+    GRIB_CHECK(grib_index_get_size(index,"number",&numberSize),0);
+    numbers=(long*)malloc(sizeof(long)*numberSize);
+    if (!numbers) exit(1);
+    /*same as for "step"*/
+    GRIB_CHECK(grib_index_get_long(index,"number",numbers,&numberSize),0);
+    printf("numberSize=%ld\n",(long)numberSize);
+    for (i=0;i<numberSize;i++) printf("%ld ",numbers[i]);
+    printf("\n");
 
-        /*same as for "step"*/
-        GRIB_CHECK(grib_index_get_size(index,"shortName",&shortNameSize),0);
-        shortName=(char**)malloc(sizeof(char*)*shortNameSize);
-        if (!shortName) exit(1);
-        /*same as for "step"*/
-        GRIB_CHECK(grib_index_get_string(index,"shortName",shortName,&shortNameSize),0);
-        printf("shortNameSize=%ld\n",(long)shortNameSize);
-        for (i=0;i<shortNameSize;i++) printf("%s ",shortName[i]);
-        printf("\n");
+    /*same as for "step"*/
+    GRIB_CHECK(grib_index_get_size(index,"shortName",&shortNameSize),0);
+    shortName=(char**)malloc(sizeof(char*)*shortNameSize);
+    if (!shortName) exit(1);
+    /*same as for "step"*/
+    GRIB_CHECK(grib_index_get_string(index,"shortName",shortName,&shortNameSize),0);
+    printf("shortNameSize=%ld\n",(long)shortNameSize);
+    for (i=0;i<shortNameSize;i++) printf("%s ",shortName[i]);
+    printf("\n");
 
-        count=0;
-        /* nested loops on the keys values of the index */
-        /* different order of the nested loops doesn't affect performance*/
-        for (i=0;i<shortNameSize;i++) {
-            /* select the GRIB with shortName=shortName[i] */
-            grib_index_select_string(index,"shortName",shortName[i]);
+    count=0;
+    /* nested loops on the keys values of the index */
+    /* different order of the nested loops doesn't affect performance*/
+    for (i=0;i<shortNameSize;i++) {
+        /* select the GRIB with shortName=shortName[i] */
+        grib_index_select_string(index,"shortName",shortName[i]);
 
-            for (l=0;l<levelSize;l++) {
-                /* select the GRIB with level=level[i] */
-                grib_index_select_long(index,"level",level[l]);
+        for (l=0;l<levelSize;l++) {
+            /* select the GRIB with level=levels[i] */
+            grib_index_select_long(index,"level",levels[l]);
 
-                for (j=0;j<numberSize;j++) {
-                    /* select the GRIB with number=number[i] */
-                    grib_index_select_long(index,"number",number[j]);
+            for (j=0;j<numberSize;j++) {
+                /* select the GRIB with number=numbers[i] */
+                grib_index_select_long(index,"number",numbers[j]);
 
-                    for (k=0;k<stepSize;k++) {
-                        /* select the GRIB with step=step[i] */
-                        grib_index_select_long(index,"step",step[k]);
+                for (k=0;k<stepSize;k++) {
+                    /* select the GRIB with step=steps[i] */
+                    grib_index_select_long(index,"step",steps[k]);
 
-                        /* create a new grib_handle from the index with the constraints
+                    /* create a new grib_handle from the index with the constraints
                            imposed by the select statements. It is a loop because
                            in the index there could be more than one GRIB with those
                            constraints */
-                        while ((h=grib_handle_new_from_index(index,&ret))!=NULL){
-                            count++;
-                            if (ret) {printf("error: %d\n",ret); exit(ret);}
-                            lenshortName=200;
-                            grib_get_string(h,"shortName",oshortName,&lenshortName);
-                            grib_get_long(h,"level",&olevel);
-                            grib_get_long(h,"number",&onumber);
-                            grib_get_long(h,"step",&ostep);
-                            printf("shortName=%s ",oshortName);
-                            printf("level=%ld ",olevel);
-                            printf("number=%ld ",onumber);
-                            printf("step=%ld \n",ostep);
-                            grib_handle_delete(h);
-                        }
-                        if (ret && ret!=GRIB_END_OF_INDEX ) {printf("error: %s\n",grib_get_error_message(ret)); exit(ret);}
+                    while ((h=grib_handle_new_from_index(index,&ret))!=NULL){
+                        count++;
+                        if (ret) {printf("error: %d\n",ret); exit(ret);}
+                        lenshortName=200;
+                        grib_get_string(h,"shortName",oshortName,&lenshortName);
+                        grib_get_long(h,"level",&olevel);
+                        grib_get_long(h,"number",&onumber);
+                        grib_get_long(h,"step",&ostep);
+                        printf("shortName=%s ",oshortName);
+                        printf("level=%ld ",olevel);
+                        printf("number=%ld ",onumber);
+                        printf("step=%ld \n",ostep);
+                        grib_handle_delete(h);
                     }
+                    if (ret && ret!=GRIB_END_OF_INDEX ) {printf("error: %s\n",grib_get_error_message(ret)); exit(ret);}
                 }
             }
         }
-        printf("  %d messages selected\n",count);
-
-        grib_index_write(index,"out.gribidx");
-        grib_index_delete(index);
     }
+    printf("  %d messages selected\n",count);
+
+    grib_index_write(index,"out.gribidx");
+    grib_index_delete(index);
 
     return 0;
 }