Skip to contentSkip to conversation

skd: use strncpy() as a cleanup

PATCH In review Dan Carpenter 2 participants 4 messages Sep 13, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 3/4 skd: use strncpy() as a cleanup

The code here is copying the version to inq.driver_version but we don't want it to be NUL terminated. Instead we pad the rest of the array with spaces. It's fewer lines to use strncpy() and maybe a little nicer.

drivers/block/skd_main.c +2 -8
index f892d95..20ad843 100644
@@ -2899,9 +2899,7 @@ static void skd_do_inq_page_da(struct skd_device *skdev,
 			       volatile struct fit_comp_error_info *skerr,
 			       uint8_t *cdb, uint8_t *buf)
 {
-	unsigned ver_byte;
 	unsigned max_bytes;
-	char *ver = DRV_VER_COMPL;
 	struct driver_inquiry_data inq;
 	u16 val;
 
@@ -2945,12 +2943,8 @@ static void skd_do_inq_page_da(struct skd_device *skdev,
 	/* Driver version, fixed lenth, padded with spaces on the right */
 	inq.driver_version_length = sizeof(inq.driver_version);
 	memset(&inq.driver_version, ' ', sizeof(inq.driver_version));
-	for (ver_byte = 0; ver_byte < sizeof(inq.driver_version); ver_byte++) {
-		if (ver[ver_byte] != 0)
-			inq.driver_version[ver_byte] = ver[ver_byte];
-		else
-			break;
-	}
+	strncpy(inq.driver_version, DRV_VER_COMPL,
+		min(sizeof(inq.driver_version), strlen(DRV_VER_COMPL)));
 
 	inq.page_length = cpu_to_be16((sizeof(inq) - 4));
 
#1 lore raw
Quoted 22 lines · Dan Carpenter

The code here is copying the version to inq.driver_version but we don't want it to be NUL terminated. Instead we pad the rest of the array with spaces. It's fewer lines to use strncpy() and maybe a little nicer.

drivers/block/skd_main.c +0 -2
index f892d95..20ad843 100644
@@ -2899,9 +2899,7 @@ static void skd_do_inq_page_da(struct skd_device *skdev,
                               volatile struct fit_comp_error_info *skerr,
                               uint8_t *cdb, uint8_t *buf)
 {
-       unsigned ver_byte;
        unsigned max_bytes;
-       char *ver = DRV_VER_COMPL;
        struct driver_inquiry_data inq;
        u16 val;
 
@@ -2945,12 +2943,8 @@ static void skd_do_inq_page_da(struct skd_device *skdev,
        /* Driver version, fixed lenth, padded with spaces on the right */

drivers/block/skd_main.c static void skd_do_inq_page_da(struct skd_device *skdev, · line 2947

Quoted 10 lines
drivers/block/skd_main.c +2 -6
        inq.driver_version_length = sizeof(inq.driver_version);
        memset(&inq.driver_version, ' ', sizeof(inq.driver_version));
-       for (ver_byte = 0; ver_byte < sizeof(inq.driver_version); ver_byte++) {
-               if (ver[ver_byte] != 0)
-                       inq.driver_version[ver_byte] = ver[ver_byte];
-               else
-                       break;
-       }
+       strncpy(inq.driver_version, DRV_VER_COMPL,
+               min(sizeof(inq.driver_version), strlen(DRV_VER_COMPL)));

This does the exact same thing as memcpy(), right? So why not use that? memcpy() has much simpler semantics than strncpy().

drivers/block/skd_main.c static void skd_do_inq_page_da(struct skd_device *skdev, · line 2949

Quoted 1 line
drivers/block/skd_main.c +0 -0
        inq.page_length = cpu_to_be16((sizeof(inq) - 4));

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#2 lore raw

PATCH v2 3/4 skd: use memcpy() as a cleanup

The code here is copying the version to inq.driver_version but we don't want it to be NUL terminated. Instead we pad the rest of the array with spaces. It's fewer lines to use memcpy() and maybe a little nicer.

---
v2: use memcpy() instead of strncpy()

drivers/block/skd_main.c +2 -8
index f892d95..20ad843 100644
@@ -2899,9 +2899,7 @@ static void skd_do_inq_page_da(struct skd_device *skdev,
 			       volatile struct fit_comp_error_info *skerr,
 			       uint8_t *cdb, uint8_t *buf)
 {
-	unsigned ver_byte;
 	unsigned max_bytes;
-	char *ver = DRV_VER_COMPL;
 	struct driver_inquiry_data inq;
 	u16 val;
 
@@ -2945,12 +2943,8 @@ static void skd_do_inq_page_da(struct skd_device *skdev,
 	/* Driver version, fixed lenth, padded with spaces on the right */
 	inq.driver_version_length = sizeof(inq.driver_version);
 	memset(&inq.driver_version, ' ', sizeof(inq.driver_version));
-	for (ver_byte = 0; ver_byte < sizeof(inq.driver_version); ver_byte++) {
-		if (ver[ver_byte] != 0)
-			inq.driver_version[ver_byte] = ver[ver_byte];
-		else
-			break;
-	}
+	memcpy(inq.driver_version, DRV_VER_COMPL,
+	       min(sizeof(inq.driver_version), strlen(DRV_VER_COMPL)));
 
 	inq.page_length = cpu_to_be16((sizeof(inq) - 4));
 

--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw
In reply to Geert Uytterhoeven
Quoted 6 lines · Geert Uytterhoeven

On Fri, Sep 13, 2013 at 10:05 AM, Dan Carpenter

drivers/block/skd_main.c static void skd_do_inq_page_da(struct skd_device *skdev, · line 2947

Quoted 2 lines
drivers/block/skd_main.c +2 -0
+       strncpy(inq.driver_version, DRV_VER_COMPL,
+               min(sizeof(inq.driver_version), strlen(DRV_VER_COMPL)));

This does the exact same thing as memcpy(), right? So why not use that? memcpy() has much simpler semantics than strncpy().

You're right. I've redone this.

regards,
dan carpenter