drivers: eeprom: Fix format strings

rettichschnidi · fabiobaltieri · commit 1c1801ee7ff3 · 2022-08-07T14:29:36.000+01:00
Building for native_posix_64 exposes faulty format strings.

Changes in this commit also ensure that the shell code gets built in CI,
thus this kind of problem can not be introduced again later on.

Signed-off-by: Reto Schneider &lt;reto.schneider@husqvarnagroup.com&gt;
diff --git a/drivers/eeprom/eeprom_shell.c b/drivers/eeprom/eeprom_shell.c
@@ -48,7 +48,7 @@ static int cmd_read(const struct shell *shell, size_t argc, char **argv)
 		return -EINVAL;
 	}
 
-	shell_print(shell, "Reading %d bytes from EEPROM, offset %d...", len,
+	shell_print(shell, "Reading %zu bytes from EEPROM, offset %zu...", len,
 		    addr);
 
 	for (upto = 0; upto < len; upto += pending) {
@@ -84,7 +84,7 @@ static int cmd_write(const struct shell *shell, size_t argc, char **argv)
 	len = argc - args_indx.data;
 
 	if (len > sizeof(wr_buf)) {
-		shell_error(shell, "Write buffer size (%d bytes) exceeded",
+		shell_error(shell, "Write buffer size (%zu bytes) exceeded",
 			    sizeof(wr_buf));
 		return -EINVAL;
 	}
@@ -104,7 +104,7 @@ static int cmd_write(const struct shell *shell, size_t argc, char **argv)
 		return -EINVAL;
 	}
 
-	shell_print(shell, "Writing %d bytes to EEPROM...", len);
+	shell_print(shell, "Writing %zu bytes to EEPROM...", len);
 
 	err = eeprom_write(eeprom, offset, wr_buf, len);
 	if (err) {
@@ -140,7 +140,7 @@ static int cmd_size(const struct shell *shell, size_t argc, char **argv)
 		return -EINVAL;
 	}
 
-	shell_print(shell, "%d bytes", eeprom_get_size(eeprom));
+	shell_print(shell, "%zu bytes", eeprom_get_size(eeprom));
 	return 0;
 }
 
@@ -173,7 +173,7 @@ static int cmd_fill(const struct shell *shell, size_t argc, char **argv)
 		return -EINVAL;
 	}
 
-	shell_print(shell, "Writing %d bytes of 0x%02lx to EEPROM...", len,
+	shell_print(shell, "Writing %zu bytes of 0x%02lx to EEPROM...", len,
 		    pattern);
 
 	addr = initial_offset;
diff --git a/samples/drivers/eeprom/overlay-shell.conf b/samples/drivers/eeprom/overlay-shell.conf
@@ -0,0 +1,3 @@
+# Ensure EEPROM shell can be compiled
+CONFIG_SHELL=y
+CONFIG_EEPROM_SHELL=y
diff --git a/samples/drivers/eeprom/sample.yaml b/samples/drivers/eeprom/sample.yaml
@@ -1,19 +1,28 @@
 sample:
   name: EEPROM Sample
-common:
+
+tests:
+  sample.drivers.eeprom:
     tags: eeprom
+    platform_allow: >
+      gd32f450i_eval
+      native_posix
+      native_posix_64
+    integration_platforms:
+      - native_posix_64
     harness: console
     harness_config:
       type: one_line
       regex:
         - "Reset the MCU to see the increasing boot counter."
-
-tests:
-  sample.drivers.eeprom:
+  sample.drivers.eeprom.shell:
     tags: eeprom
-    platform_allow: native_posix gd32f450i_eval
-    integration_platforms:
-      - native_posix
+    platform_allow: >
+      gd32f450i_eval
+      native_posix
+      native_posix_64
+    extra_args: OVERLAY_CONFIG=overlay-shell.conf
+    harness: keyboard
   sample.drivers.eeprom.shield.x_nucleo_eeprma2:
     tags: eeprom shield
     depends_on: arduino_gpio arduino_i2c arduino_spi
diff --git a/samples/drivers/eeprom/src/main.c b/samples/drivers/eeprom/src/main.c
@@ -47,7 +47,7 @@ void main(void)
 	}
 
 	eeprom_size = eeprom_get_size(eeprom);
-	printk("Using eeprom with size of: %d.\n", eeprom_size);
+	printk("Using eeprom with size of: %zu.\n", eeprom_size);
 
 	rc = eeprom_read(eeprom, EEPROM_SAMPLE_OFFSET, &values, sizeof(values));
 	if (rc < 0) {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ static int cmd_read(const struct shell shell, size_t argc, char *argv)`
`48`	`48`	`return -EINVAL;`
`49`	`49`	`}`
`50`	`50`
`51`		`- shell_print(shell, "Reading %d bytes from EEPROM, offset %d...", len,`
	`51`	`+ shell_print(shell, "Reading %zu bytes from EEPROM, offset %zu...", len,`
`52`	`52`	`addr);`
`53`	`53`
`54`	`54`	`for (upto = 0; upto < len; upto += pending) {`
`@@ -84,7 +84,7 @@ static int cmd_write(const struct shell shell, size_t argc, char *argv)`
`84`	`84`	`len = argc - args_indx.data;`
`85`	`85`
`86`	`86`	`if (len > sizeof(wr_buf)) {`
`87`		`- shell_error(shell, "Write buffer size (%d bytes) exceeded",`
	`87`	`+ shell_error(shell, "Write buffer size (%zu bytes) exceeded",`
`88`	`88`	`sizeof(wr_buf));`
`89`	`89`	`return -EINVAL;`
`90`	`90`	`}`
`@@ -104,7 +104,7 @@ static int cmd_write(const struct shell shell, size_t argc, char *argv)`
`104`	`104`	`return -EINVAL;`
`105`	`105`	`}`
`106`	`106`
`107`		`- shell_print(shell, "Writing %d bytes to EEPROM...", len);`
	`107`	`+ shell_print(shell, "Writing %zu bytes to EEPROM...", len);`
`108`	`108`
`109`	`109`	`err = eeprom_write(eeprom, offset, wr_buf, len);`
`110`	`110`	`if (err) {`
`@@ -140,7 +140,7 @@ static int cmd_size(const struct shell shell, size_t argc, char *argv)`
`140`	`140`	`return -EINVAL;`
`141`	`141`	`}`
`142`	`142`
`143`		`- shell_print(shell, "%d bytes", eeprom_get_size(eeprom));`
	`143`	`+ shell_print(shell, "%zu bytes", eeprom_get_size(eeprom));`
`144`	`144`	`return 0;`
`145`	`145`	`}`
`146`	`146`
`@@ -173,7 +173,7 @@ static int cmd_fill(const struct shell shell, size_t argc, char *argv)`
`173`	`173`	`return -EINVAL;`
`174`	`174`	`}`
`175`	`175`
`176`		`- shell_print(shell, "Writing %d bytes of 0x%02lx to EEPROM...", len,`
	`176`	`+ shell_print(shell, "Writing %zu bytes of 0x%02lx to EEPROM...", len,`
`177`	`177`	`pattern);`
`178`	`178`
`179`	`179`	`addr = initial_offset;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Ensure EEPROM shell can be compiled`
	`2`	`+CONFIG_SHELL=y`
	`3`	`+CONFIG_EEPROM_SHELL=y`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ void main(void)`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`eeprom_size = eeprom_get_size(eeprom);`
`50`		`- printk("Using eeprom with size of: %d.\n", eeprom_size);`
	`50`	`+ printk("Using eeprom with size of: %zu.\n", eeprom_size);`
`51`	`51`
`52`	`52`	`rc = eeprom_read(eeprom, EEPROM_SAMPLE_OFFSET, &values, sizeof(values));`
`53`	`53`	`if (rc < 0) {`