Refactoring

Author: shahramn

src/grib_accessor_class_g2grid.cc

@@ -148,14 +148,13 @@ static int value_count(grib_accessor* a, long* count)
 static int unpack_double(grib_accessor* a, double* val, size_t* len)
 {
     grib_accessor_g2grid* self = (grib_accessor_g2grid*)a;
-    grib_handle* hand          = grib_handle_of_accessor(a);
-    int ret                    = 0;
+    grib_handle* hand = grib_handle_of_accessor(a);
+    int ret = GRIB_SUCCESS;
 
     long basic_angle  = 0;
     long sub_division = 0;
-    int n             = 0;
+    int n = 0;
     long v[6];
-    int i;
 
     if (*len < 6) {
         ret = GRIB_ARRAY_TOO_SMALL;
@@ -199,7 +198,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
         if ((ret = grib_get_long_internal(hand, self->j_increment, &v[n++])) != GRIB_SUCCESS)
             return ret;
     }
-    for (i = 0; i < n; i++)
+    for (int i = 0; i < n; i++)
         if (v[i] == GRIB_MISSING_LONG)
             val[i] = GRIB_MISSING_DOUBLE;
         else
@@ -282,15 +281,14 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
 {
     grib_accessor_g2grid* self = (grib_accessor_g2grid*)a;
     grib_handle* hand          = grib_handle_of_accessor(a);
-    int ret;
+    int ret = GRIB_SUCCESS;
     long v[6];
     int n;
     long basic_angle;
     long sub_division;
 
     if (*len < 6) {
-        ret = GRIB_ARRAY_TOO_SMALL;
-        return ret;
+        return GRIB_ARRAY_TOO_SMALL;
     }
 
     /* printf("pack_double %g %g %g %g %g %g\n",val[0],val[1],val[2],val[3],val[4],val[5]);*/

src/grib_accessor_class_latitudes.cc

@@ -114,16 +114,16 @@ static int get_distinct(grib_accessor* a, double** val, long* len);
 
 static int compare_doubles(const void* a, const void* b, int ascending)
 {
-    /* ascending is a boolean: 0 or 1 */
+    // ascending is a boolean: 0 or 1
     double* arg1 = (double*)a;
     double* arg2 = (double*)b;
     if (ascending) {
         if (*arg1 < *arg2)
-            return -1; /*Smaller values come before larger ones*/
+            return -1; // Smaller values come before larger ones
     }
     else {
         if (*arg1 > *arg2)
-            return -1; /*Larger values come before smaller ones*/
+            return -1; // Larger values come before smaller ones
     }
     if (*arg1 == *arg2)
         return 0;
@@ -155,7 +155,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
 {
     grib_context* c               = a->context;
     grib_accessor_latitudes* self = (grib_accessor_latitudes*)a;
-    int ret = 0;
+    int ret = GRIB_SUCCESS;
     double* v = val;
     double dummyLon = 0;
     size_t size = 0;
@@ -167,7 +167,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     if (ret) return ret;
     size = count;
     if (*len < size) {
-        /* self->lats are computed in value_count so must free */
+        // self->lats are computed in value_count so must free
         if (self->lats) {
             grib_context_free(c, self->lats);
             self->lats = NULL;
@@ -176,7 +176,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     }
     self->save = 0;
 
-    /* self->lats are computed in value_count*/
+    // self->lats are computed in value_count
     if (self->lats) {
         int i;
         *len = self->size;
@@ -211,7 +211,7 @@ static int value_count(grib_accessor* a, long* len)
     grib_handle* h                = grib_handle_of_accessor(a);
     grib_context* c               = a->context;
     double* val                   = NULL;
-    int ret;
+    int ret = GRIB_SUCCESS;
     size_t size;
 
     *len = 0;
@@ -251,9 +251,9 @@ static int get_distinct(grib_accessor* a, double** val, long* len)
     double* v       = NULL;
     double* v1      = NULL;
     double dummyLon = 0;
-    int ret = 0;
+    int ret = GRIB_SUCCESS;
     int i;
-    long jScansPositively = 0; /* default: north to south */
+    long jScansPositively = 0; // default: north to south
     size_t size           = *len;
     grib_context* c       = a->context;
 
@@ -276,14 +276,14 @@ static int get_distinct(grib_accessor* a, double** val, long* len)
     grib_iterator_delete(iter);
     v = *val;
 
-    /* See which direction the latitudes are to be scanned */
+    // See which direction the latitudes are to be scanned
     if ((ret = grib_get_long_internal(grib_handle_of_accessor(a), "jScansPositively", &jScansPositively)))
         return ret;
     if (jScansPositively) {
-        qsort(v, *len, sizeof(double), &compare_doubles_ascending); /*South to North*/
+        qsort(v, *len, sizeof(double), &compare_doubles_ascending); //South to North
     }
     else {
-        qsort(v, *len, sizeof(double), &compare_doubles_descending); /*North to South*/
+        qsort(v, *len, sizeof(double), &compare_doubles_descending); //North to South
     }
 
     v1 = (double*)grib_context_malloc_clear(c, size * sizeof(double));
@@ -292,14 +292,14 @@ static int get_distinct(grib_accessor* a, double** val, long* len)
         return GRIB_OUT_OF_MEMORY;
     }
 
-    /* Construct a unique set of lats by filtering out duplicates */
+    // Construct a unique set of lats by filtering out duplicates
     prev  = v[0];
     v1[0] = prev;
     count = 1;
     for (i = 1; i < *len; i++) {
         if (v[i] != prev) {
             prev      = v[i];
-            v1[count] = prev; /* Value different from previous so store it */
+            v1[count] = prev; // Value different from previous so store it
             count++;
         }
     }

src/grib_expression_class_binop.cc

@@ -83,7 +83,6 @@ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
 {
     long v1 = 0;
     long v2 = 0;
-    int ret;
     grib_expression_binop* e = (grib_expression_binop*)g;
 
 // #if DEBUGGING
@@ -100,7 +99,7 @@ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
 //         printf("\n");
 //     }
 
-    ret = grib_expression_evaluate_long(h, e->left, &v1);
+    int ret = grib_expression_evaluate_long(h, e->left, &v1);
     if (ret != GRIB_SUCCESS)
         return ret;
 
@@ -116,8 +115,6 @@ static int evaluate_double(grib_expression* g, grib_handle* h, double* dres)
 {
     double v1 = 0.0;
     double v2 = 0.0;
-    int ret;
-
     grib_expression_binop* e = (grib_expression_binop*)g;
 
 // #if DEBUGGING
@@ -134,7 +131,7 @@ static int evaluate_double(grib_expression* g, grib_handle* h, double* dres)
 //         printf("\n");
 //     }
 
-    ret = grib_expression_evaluate_double(h, e->left, &v1);
+    int ret = grib_expression_evaluate_double(h, e->left, &v1);
     if (ret != GRIB_SUCCESS)
         return ret;