Skip to content

Commit

Permalink
fix indentation and naming
Browse files Browse the repository at this point in the history
  • Loading branch information
@aaronsms
aaronsms committed Dec 5, 2022
1 parent ddb8242 commit b465a06
Showing 1 changed file with 40 additions and 54 deletions.
94 changes: 40 additions & 54 deletions raster/r.univar/r.univar_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,23 +423,17 @@ process_raster(univar_stat * stats, int *fd, int *fdz,
switch (map_type) {
case DCELL_TYPE:
msize = t_bkt->n_alloc * sizeof(DCELL);
t_bkt->dcells =
(DCELL *) G_realloc((void *)t_bkt->dcells,
msize);
t_bkt->dcells = (DCELL *) G_realloc((void *)t_bkt->dcells, msize);
t_bkt->nextp = (void *)&(t_bkt->dcells[t_bkt->n]);
break;
case FCELL_TYPE:
msize = t_bkt->n_alloc * sizeof(FCELL);
t_bkt->fcells =
(FCELL *) G_realloc((void *)t_bkt->fcells,
msize);
t_bkt->fcells = (FCELL *) G_realloc((void *)t_bkt->fcells, msize);
t_bkt->nextp = (void *)&(t_bkt->fcells[t_bkt->n]);
break;
case CELL_TYPE:
msize = t_bkt->n_alloc * sizeof(CELL);
t_bkt->cells =
(CELL *) G_realloc((void *)t_bkt->cells,
msize);
t_bkt->cells = (CELL *) G_realloc((void *)t_bkt->cells, msize);
t_bkt->nextp = (void *)&(t_bkt->cells[t_bkt->n]);
break;
}
Expand Down Expand Up @@ -483,59 +477,57 @@ process_raster(univar_stat * stats, int *fd, int *fdz,
Case 1: first transfer, skip reallocation and point to the buffer.
Case 2: other transfers, reallocate exactly if any non-empty bucket.
*/
bucket *t_bucket = &buckets[z];
univar_stat *g_buffer = &stats[z];
bucket *t_bkt = &buckets[z];
univar_stat *g_bfr = &stats[z];
size_t old_size;
size_t add_size;

switch (map_type) {
case DCELL_TYPE:
if (NULL == g_buffer->dcell_array) {
g_buffer->dcell_array = t_bucket->dcells;
if (NULL == g_bfr->dcell_array) {
g_bfr->dcell_array = t_bkt->dcells;
t_bkt->dcells = NULL;
}
else if (t_bucket->n != 0) {
old_size = g_buffer->n * sizeof(DCELL);
add_size = t_bucket->n * sizeof(DCELL);

g_buffer->dcell_array = (DCELL *) G_realloc((void
*)
g_buffer->dcell_array, old_size + add_size);
memcpy(&g_buffer->dcell_array[g_buffer->n],
t_bucket->dcells, add_size);
else if (t_bkt->n != 0) {
old_size = g_bfr->n * sizeof(DCELL);
add_size = t_bkt->n * sizeof(DCELL);

g_bfr->dcell_array = (DCELL *)
G_realloc((void *) g_bfr->dcell_array, old_size + add_size);
memcpy(&g_bfr->dcell_array[g_bfr->n], t_bkt->dcells, add_size);
}
break;
case FCELL_TYPE:
if (NULL == g_buffer->fcell_array) {
g_buffer->fcell_array = t_bucket->fcells;
if (NULL == g_bfr->fcell_array) {
g_bfr->fcell_array = t_bkt->fcells;
t_bkt->fcells = NULL;
}
else if (t_bucket->n != 0) {
old_size = g_buffer->n * sizeof(FCELL);
add_size = t_bucket->n * sizeof(FCELL);

g_buffer->fcell_array = (FCELL *) G_realloc((void
*)
g_buffer->fcell_array, old_size + add_size);
memcpy(&g_buffer->fcell_array[g_buffer->n],
t_bucket->fcells, add_size);
else if (t_bkt->n != 0) {
old_size = g_bfr->n * sizeof(FCELL);
add_size = t_bkt->n * sizeof(FCELL);

g_bfr->fcell_array = (FCELL *)
G_realloc((void *) g_bfr->fcell_array, old_size + add_size);
memcpy(&g_bfr->fcell_array[g_bfr->n], t_bkt->fcells, add_size);
}
break;
case CELL_TYPE:
if (NULL == g_buffer->cell_array) {
g_buffer->cell_array = t_bucket->cells;
if (NULL == g_bfr->cell_array) {
g_bfr->cell_array = t_bkt->cells;
t_bkt->cells = NULL;
}
else if (t_bucket->n != 0) {
old_size = g_buffer->n * sizeof(CELL);
add_size = t_bucket->n * sizeof(CELL);

g_buffer->cell_array = (CELL *) G_realloc((void *)
g_buffer->cell_array, old_size + add_size);
memcpy(&g_buffer->cell_array[g_buffer->n],
t_bucket->cells, add_size);
else if (t_bkt->n != 0) {
old_size = g_bfr->n * sizeof(CELL);
add_size = t_bkt->n * sizeof(CELL);

g_bfr->cell_array = (CELL *)
G_realloc((void *) g_bfr->cell_array, old_size + add_size);
memcpy(&g_bfr->cell_array[g_bfr->n], t_bkt->cells, add_size);
}
break;
}

g_buffer->n += t_bucket->n;
g_bfr->n += t_bkt->n;
}
}
else {
Expand Down Expand Up @@ -569,18 +561,12 @@ process_raster(univar_stat * stats, int *fd, int *fdz,

/* Free per-thread variables */
for (z = 0; z < n_alloc; z++) {
if(buckets[z].nextp) {
G_free(buckets[z].nextp);
}
if(buckets[z].cells) {
if (buckets[z].cells)
G_free(buckets[z].cells);
}
if(buckets[z].fcells) {
G_free(buckets[z].fcells);
}
if(buckets[z].dcells) {
if (buckets[z].fcells)
G_free(buckets[z].fcells);
}
if (buckets[z].dcells)
G_free(buckets[z].dcells);
}
G_free(buckets);

Expand Down

0 comments on commit b465a06

Please sign in to comment.