Attachment 156280 Details for Bug 242805 – fix

[patch] fix

pcmciautils-014-funcname.patch (text/plain), 1.17 KB, created by David Woodhouse on 2007-06-05 21:21:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2007-06-05 21:21:39 UTC

Size: 1.17 KB

patch

obsolete

>--- pcmciautils-014/src/pccardctl.c~	2006-06-01 10:07:52.000000000 +0100
>+++ pcmciautils-014/src/pccardctl.c	2007-06-05 22:20:36.000000000 +0100
>@@ -37,6 +37,7 @@ static char *fn[] = {
> 	"AIMS",
> 	"SCSI"
> };
>+#define NR_FNS ( sizeof(fn) / sizeof(*fn) )
> 
> /* crc32hash.c - derived from linux/lib/crc32.c, GNU GPL v2 */
> static unsigned int crc32(unsigned char const *p, unsigned int len)
>@@ -219,7 +220,7 @@ static int pccardctl_ident(unsigned long
> 	char *prod_id[4];
> 	int valid_prod_id = 0;
> 	int i;
>-	unsigned int manf_id, card_id;
>+	unsigned int manf_id, card_id, func_id;
> 
> 	if (!pccardctl_socket_exists(socket_no))
> 		return -ENODEV;
>@@ -249,9 +250,15 @@ static int pccardctl_ident(unsigned long
> 		if (!pccardctl_get_one(socket_no, "card_id", &card_id))
> 			printf("  manfid: 0x%04x, 0x%04x\n", manf_id, card_id);
> 
>-	if (!pccardctl_get_one(socket_no, "func_id", &manf_id))
>-		printf("  function: %d (%s)\n", manf_id, fn[manf_id]);
>+	if (!pccardctl_get_one(socket_no, "func_id", &func_id)) {
>+		char *func_name;
>+		if (func_id < NR_FNS)
>+			func_name = fn[func_id];
>+		else
>+			func_name = "unknown";
> 
>+		printf("  function: 0x%x (%s), %d\n", func_id, func_name, NR_FNS);
>+	}
> 
> 	return 0;
> }

Actions: View | Diff

Attachments on bug 242805: 156280