Skip to contentSkip to conversation

OMAP4 USB BOOT: remove double line endings

PATCH Applied Vicente Bergas 3 participants 3 messages Feb 24, 2013 – Feb 25, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 OMAP4 USB BOOT: remove double line endings

From previous patch that replaced printf with puts:
puts adds it's own line ending, so do not append it manually

---
 scripts/omap4_usbboot.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
scripts/omap4_usbboot.c +2 -3
index 34e53c0..e521086 100644
@@ -78,7 +78,7 @@ int read_asic_id(struct usb_handle *usb)
 	const uint32_t msg_getid = 0xF0030003;
 	int i, j, k, ret;
 	uint8_t id[81];
-	char line[LINEWIDTH*3+8];
+	char line[LINEWIDTH*3+5];
 
 	printf("reading ASIC ID\n");
 	memset(id , 0xee, sizeof(id));
@@ -96,8 +96,7 @@ int read_asic_id(struct usb_handle *usb)
 		sprintf(line, "%02X: ", i);
 		for (j = 0; j < LINEWIDTH && j < sizeof(id)-i; j++)
 			sprintf(line+4+j*3, "%02X ", id[i+j]);
-		line[4+j*3+0] = '\n';
-		line[4+j*3+1] = 0;
+		line[4+j*3] = 0;
 		puts(line);
 	}
 	ret = 0;
Signature · 7 lines
1.8.1.4


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Applied
#1 lore raw
Quoted 4 lines · Vicente Bergas

From previous patch that replaced printf with puts:
puts adds it's own line ending, so do not append it manually

Applied, thanks

Sascha

Quoted 36 lines
---
 scripts/omap4_usbboot.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
scripts/omap4_usbboot.c +2 -3
index 34e53c0..e521086 100644
@@ -78,7 +78,7 @@ int read_asic_id(struct usb_handle *usb)
 	const uint32_t msg_getid = 0xF0030003;
 	int i, j, k, ret;
 	uint8_t id[81];
-	char line[LINEWIDTH*3+8];
+	char line[LINEWIDTH*3+5];
 
 	printf("reading ASIC ID\n");
 	memset(id , 0xee, sizeof(id));
@@ -96,8 +96,7 @@ int read_asic_id(struct usb_handle *usb)
 		sprintf(line, "%02X: ", i);
 		for (j = 0; j < LINEWIDTH && j < sizeof(id)-i; j++)
 			sprintf(line+4+j*3, "%02X ", id[i+j]);
-		line[4+j*3+0] = '\n';
-		line[4+j*3+1] = 0;
+		line[4+j*3] = 0;
 		puts(line);
 	}
 	ret = 0;
Signature · 7 lines
1.8.1.4


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#2 lore raw
Quoted 3 lines · Sascha Hauer
Quoted 2 lines · Vicente Bergas

From previous patch that replaced printf with puts:
puts adds it's own line ending, so do not append it manually

Thanks for fixing, I did not remember of the additional newline.

I need to fix the other puts, i will push a patch to change puts (str)-> fprinf('%s", str)
for the menu.c.

Quoted 52 lines
Quoted 2 lines

Applied, thanks

Sascha

Quoted 31 lines
---
 scripts/omap4_usbboot.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
scripts/omap4_usbboot.c +2 -4
index 34e53c0..e521086 100644
@@ -78,7 +78,7 @@ int read_asic_id(struct usb_handle *usb)
      const uint32_t msg_getid = 0xF0030003;
      int i, j, k, ret;
      uint8_t id[81];
-     char line[LINEWIDTH*3+8];
+     char line[LINEWIDTH*3+5];
 
      printf("reading ASIC ID\n");
      memset(id , 0xee, sizeof(id));
@@ -96,8 +96,7 @@ int read_asic_id(struct usb_handle *usb)
              sprintf(line, "%02X: ", i);
              for (j = 0; j < LINEWIDTH && j < sizeof(id)-i; j++)
                      sprintf(line+4+j*3, "%02X ", id[i+j]);
-             line[4+j*3+0] = '\n';
-             line[4+j*3+1] = 0;
+             line[4+j*3] = 0;
              puts(line);
      }
      ret = 0;
--

1.8.1.4

Quoted 5 lines

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

--

Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
Quoted 4 lines

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

--
Fabio Porcedda

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox