tools: ftdgrep: correct the find regions loop in do_fdtgrep

Use realloc and update the loop executed in do_fdtgrep to find all
the regions: only test count > max_region after the second pass.

This patch solve an issue if the number of region found (count)
is greater then the default value (max_region = count = 100):
the second pass is never executed, because the loop stops after
the first pass (i = 0, count > 100, max_regions = 100)
with error -1 and the error message
"Internal error with fdtgrep_find_region".

I also update the error message.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>

diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c
index 8f44f59..2a8058f 100644 (file)
--- a/tools/fdtgrep.c
+++ b/tools/fdtgrep.c
@@ -805,7 +805,7 @@ static int do_fdtgrep(struct display_info *disp, const char *filename)
         * we do another pass to actually record them.
         */
        for (i = 0; i < 2; i++) {
-               region = malloc(count * sizeof(struct fdt_region));
+               region = realloc(region, count * sizeof(struct fdt_region));
                if (!region) {
                        fprintf(stderr, "Out of memory for %d regions\n",
                                count);
@@ -823,8 +823,10 @@ static int do_fdtgrep(struct display_info *disp, const char *filename)
                }
                if (count <= max_regions)
                        break;
+       }
+       if (count > max_regions) {
                free(region);
-               fprintf(stderr, "Internal error with fdtgrep_find_region)(\n");
+               fprintf(stderr, "Internal error with fdtgrep_find_region()\n");
                return -1;
        }