ata: libata-eh: Remove unnecessary snprintf arithmetic

PATCH Applied Levente Kurusa 2 participants 2 messages Oct 29, 2013 libata

Share & tools

Levente Kurusa

author

2013-10-29 19:01 UTC #0 lore raw

PATCH v2 1/1 ata: libata-eh: Remove unnecessary snprintf arithmetic

Remove an unnecessary arithmetic operation from a call to snprintf, because the size parameter of snprintf includes the trailing null space. Also, initialize the buffer on definition instead of a memset call.

Signed-off-by Levente Kurusa <[email protected]>

---

drivers/ata/libata-eh.c +2 -3

index f9476fb..b7c4146 100644
@@ -2394,7 +2399,7 @@ static void ata_eh_link_report(struct ata_link *link)
 	struct ata_port *ap = link->ap;
 	struct ata_eh_context *ehc = &link->eh_context;
 	const char *frozen, *desc;
-	char tries_buf[6];
+	char tries_buf[6] = "";
 	int tag, nr_failed = 0;
 
 	if (ehc->i.flags & ATA_EHI_QUIET)

@@ -2425,9 +2432,8 @@ static void ata_eh_link_report(struct ata_link *link)
 	if (ap->pflags & ATA_PFLAG_FROZEN)
 		frozen = " frozen";
 
-	memset(tries_buf, 0, sizeof(tries_buf));
 	if (ap->eh_tries < ATA_EH_MAX_TRIES)
-		snprintf(tries_buf, sizeof(tries_buf) - 1, " t%d",
+		snprintf(tries_buf, sizeof(tries_buf), " t%d",
 			 ap->eh_tries);
 
 	if (ehc->i.dev) {

Tejun Heo

Applied

2013-10-29 19:16 UTC #1 lore raw

Quoted 5 lines · Levente Kurusa

Remove an unnecessary arithmetic operation from a call to snprintf, because the size parameter of snprintf includes the trailing null space. Also, initialize the buffer on definition instead of a memset call.
Signed-off-by Levente Kurusa <[email protected]>

Applied to libata/for-3.13.

Thanks.

Signature · 1 line

tejun