Change in ...flashrom[master]: layout: Drop `count` parameter of flashrom_layout_empty()

[Nico Huber (Code Review)]

Hello Angel Pons, Arthur Heymans, David Hendricks, Thomas Heijligen,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/flashrom/+/33544

to review the following change.

Change subject: layout: Drop `count` parameter of flashrom_layout_empty()
......................................................................

layout: Drop `count` parameter of flashrom_layout_empty()

Change-Id: I22c180c9971068b1ae101845ce88484c6842b852
Signed-off-by: Nico Huber 
---
M flashrom.c
M ich_descriptors.c
M layout.c
M libflashrom.h
4 files changed, 5 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/44/33544/1

diff --git a/flashrom.c b/flashrom.c
index cb91cef..eeaa067 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -1332,7 +1332,7 @@
    	return -1;

/* Fill default layout covering the whole chip. */
-	if (flashrom_layout_empty(&flash->default_layout, 1) ||
+	if (flashrom_layout_empty(&flash->default_layout) ||
        flashrom_layout_add_region(flash->default_layout,
    		0, flash->chip->total_size * 1024 - 1, "complete flash") ||
        flashrom_layout_include_region(flash->default_layout, "complete flash"))
diff --git a/ich_descriptors.c b/ich_descriptors.c
index 8383801..1d35cca 100644
--- a/ich_descriptors.c
+++ b/ich_descriptors.c
@@ -1170,7 +1170,7 @@
    if (read_ich_descriptors_from_dump(dump, len, &cs, &desc))
    	return 1;

-	if (flashrom_layout_empty(layout, ARRAY_SIZE(regions)))
+	if (flashrom_layout_empty(layout))
    	return 2;

ssize_t i;
diff --git a/layout.c b/layout.c
index 3560a18..9d633bb 100644
--- a/layout.c
+++ b/layout.c
@@ -33,7 +33,7 @@
 struct flashrom_layout *get_global_layout(void)
 {
    if (!global_layout)
-		flashrom_layout_empty(&global_layout, 0);
+		flashrom_layout_empty(&global_layout);
    return global_layout;
 }

@@ -264,12 +264,11 @@
  * @brief Create a new, empty layout.
  *
  * @param layout Pointer to returned layout reference.
- * @param count  Number of layout entries to allocate.
  *
  * @return 0 on success,
  *         1 if out of memory.
  */
-int flashrom_layout_empty(struct flashrom_layout **const layout, const unsigned int count)
+int flashrom_layout_empty(struct flashrom_layout **layout)
 {
    *layout = malloc(sizeof(**layout));
    if (!*layout) {
diff --git a/libflashrom.h b/libflashrom.h
index 90f3e2c..785217e 100644
--- a/libflashrom.h
+++ b/libflashrom.h
@@ -62,7 +62,7 @@
 int flashrom_image_verify(struct flashrom_flashctx *, const void *buffer, size_t buffer_len);

struct flashrom_layout;
-int flashrom_layout_empty(struct flashrom_layout **layout, unsigned int count);
+int flashrom_layout_empty(struct flashrom_layout **);
 int flashrom_layout_read_from_ifd(struct flashrom_layout **, struct flashrom_flashctx *, const void *dump, size_t len);
 int flashrom_layout_read_fmap_from_rom(struct flashrom_layout **,
    	struct flashrom_flashctx *, off_t offset, size_t length);

Change in flashrom[master]: layout: Drop `count` parameter of flashrom_layout_empty()

[Angel Pons (Code Review)]

Attention is currently required from: Nico Huber.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33544 )

Change subject: layout: Drop `count` parameter of flashrom_layout_empty()
......................................................................

Patch Set 2: Code-Review+2

Change in flashrom[master]: layout: Drop `count` parameter of flashrom_layout_empty()

[Nico Huber (Code Review)]

Attention is currently required from: Nico Huber, Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk, Peter Marheine.
Hello build bot (Jenkins), David Hendricks, Thomas Heijligen, Edward O'Callaghan, Angel Pons, Daniel Campello, Arthur Heymans, Anastasia Klimchuk, Peter Marheine,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/flashrom/+/33544

to look at the new patch set (#3).

Change subject: layout: Drop `count` parameter of flashrom_layout_empty()
......................................................................

layout: Drop `count` parameter of flashrom_layout_empty()

Change-Id: I22c180c9971068b1ae101845ce88484c6842b852
Signed-off-by: Nico Huber 
---
M flashrom.c
M ich_descriptors.c
M layout.c
M libflashrom.h
4 files changed, 5 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/44/33544/3

Change in flashrom[master]: layout: Drop `count` parameter of flashrom_layout_empty()

[Peter Marheine (Code Review)]

Attention is currently required from: Nico Huber, Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk.
Peter Marheine has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33544 )

Change subject: layout: Drop `count` parameter of flashrom_layout_empty()
......................................................................

Patch Set 3: Code-Review+1

Change in flashrom[master]: layout: Drop `count` parameter of flashrom_layout_new()

[Nico Huber (Code Review)]

Attention is currently required from: Nico Huber, Edward O'Callaghan, Daniel Campello, Anastasia Klimchuk.
Hello build bot (Jenkins), David Hendricks, Thomas Heijligen, Edward O'Callaghan, Daniel Campello, Angel Pons, Arthur Heymans, Anastasia Klimchuk, Peter Marheine,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/flashrom/+/33544

to look at the new patch set (#4).

Change subject: layout: Drop `count` parameter of flashrom_layout_new()
......................................................................

layout: Drop `count` parameter of flashrom_layout_new()

Change-Id: I22c180c9971068b1ae101845ce88484c6842b852
Signed-off-by: Nico Huber 
---
M flashrom.c
M ich_descriptors.c
M layout.c
M libflashrom.h
4 files changed, 5 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/44/33544/4

Change in flashrom[master]: layout: Drop `count` parameter of flashrom_layout_new()

[Edward O'Callaghan (Code Review)]

Attention is currently required from: Nico Huber, Daniel Campello, Anastasia Klimchuk.
Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33544 )

Change subject: layout: Drop `count` parameter of flashrom_layout_new()
......................................................................

Patch Set 4: Code-Review+2

Change in flashrom[master]: layout: Drop `count` parameter of flashrom_layout_new()

[Anastasia Klimchuk (Code Review)]

Attention is currently required from: Nico Huber, Daniel Campello.
Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33544 )

Change subject: layout: Drop `count` parameter of flashrom_layout_new()
......................................................................

Patch Set 5: Code-Review+1

Change in flashrom[master]: layout: Drop `count` parameter of flashrom_layout_new()

[Nico Huber (Code Review)]

Attention is currently required from: Nico Huber, Daniel Campello.
Hello build bot (Jenkins), David Hendricks, Thomas Heijligen, Edward O'Callaghan, Daniel Campello, Angel Pons, Arthur Heymans, Anastasia Klimchuk, Peter Marheine,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/flashrom/+/33544

to look at the new patch set (#7).

Change subject: layout: Drop `count` parameter of flashrom_layout_new()
......................................................................

layout: Drop `count` parameter of flashrom_layout_new()

Change-Id: I22c180c9971068b1ae101845ce88484c6842b852
Signed-off-by: Nico Huber 
---
M flashrom.c
M ich_descriptors.c
M layout.c
M libflashrom.h
4 files changed, 5 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/44/33544/7

Change in flashrom[master]: layout: Drop `count` parameter of flashrom_layout_new()

[Anastasia Klimchuk (Code Review)]

Attention is currently required from: Nico Huber, Daniel Campello.
Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33544 )

Change subject: layout: Drop `count` parameter of flashrom_layout_new()
......................................................................

Patch Set 7: Code-Review+2

Change in flashrom[master]: layout: Drop `count` parameter of flashrom_layout_new()

[Angel Pons (Code Review)]

Attention is currently required from: Nico Huber, Daniel Campello.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33544 )

Change subject: layout: Drop `count` parameter of flashrom_layout_new()
......................................................................

Patch Set 9: Code-Review+2

Change in flashrom[master]: layout: Drop `count` parameter of flashrom_layout_new()

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/33544 )

Change subject: layout: Drop `count` parameter of flashrom_layout_new()
......................................................................

layout: Drop `count` parameter of flashrom_layout_new()

Change-Id: I22c180c9971068b1ae101845ce88484c6842b852
Signed-off-by: Nico Huber 
Reviewed-on: https://review.coreboot.org/c/flashrom/+/33544
Reviewed-by: Angel Pons 
Reviewed-by: Anastasia Klimchuk 
Reviewed-by: Edward O'Callaghan 
Tested-by: build bot (Jenkins) 
---
M flashrom.c
M ich_descriptors.c
M layout.c
M libflashrom.h
4 files changed, 5 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved
  Edward O'Callaghan: Looks good to me, approved
  Anastasia Klimchuk: Looks good to me, approved

diff --git a/flashrom.c b/flashrom.c
index 34cbdac..b20e3e1 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -823,7 +823,7 @@
    	return -1;

/* Fill default layout covering the whole chip. */
-	if (flashrom_layout_new(&flash->default_layout, 1) ||
+	if (flashrom_layout_new(&flash->default_layout) ||
        flashrom_layout_add_region(flash->default_layout,
    		0, flash->chip->total_size * 1024 - 1, "complete flash") ||
        flashrom_layout_include_region(flash->default_layout, "complete flash"))
diff --git a/ich_descriptors.c b/ich_descriptors.c
index 5e6c7fb..21fc40b 100644
--- a/ich_descriptors.c
+++ b/ich_descriptors.c
@@ -1279,7 +1279,7 @@
    	return 1;
    }

-	if (flashrom_layout_new(layout, ARRAY_SIZE(regions)))
+	if (flashrom_layout_new(layout))
    	return 2;

ssize_t i;
diff --git a/layout.c b/layout.c
index 8047a93..e71f6a4 100644
--- a/layout.c
+++ b/layout.c
@@ -34,7 +34,7 @@
 struct flashrom_layout *get_global_layout(void)
 {
    if (!global_layout)
-		flashrom_layout_new(&global_layout, 0);
+		flashrom_layout_new(&global_layout);
    return global_layout;
 }

@@ -378,12 +378,11 @@
  * @brief Create a new, empty layout.
  *
  * @param layout Pointer to returned layout reference.
- * @param count  Number of layout entries to allocate.
  *
  * @return 0 on success,
  *         1 if out of memory.
  */
-int flashrom_layout_new(struct flashrom_layout **const layout, const unsigned int count)
+int flashrom_layout_new(struct flashrom_layout **const layout)
 {
    *layout = malloc(sizeof(**layout));
    if (!*layout) {
diff --git a/libflashrom.h b/libflashrom.h
index b13b3fb..3bd6855 100644
--- a/libflashrom.h
+++ b/libflashrom.h
@@ -106,7 +106,7 @@
 int flashrom_image_verify(struct flashrom_flashctx *, const void *buffer, size_t buffer_len);

struct flashrom_layout;
-int flashrom_layout_new(struct flashrom_layout **, unsigned int count);
+int flashrom_layout_new(struct flashrom_layout **);
 int flashrom_layout_read_from_ifd(struct flashrom_layout **, struct flashrom_flashctx *, const void *dump, size_t len);
 int flashrom_layout_read_fmap_from_rom(struct flashrom_layout **,
    	struct flashrom_flashctx *, off_t offset, size_t length);