dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[PATCH] dmi: make dmi_string() behave like strdup() 

This patch changes dmi_string() function to allocate string copy by itself, to
avoid code duplication in the next patch.

Signed-off-by: Andrey Panin <pazke@donpac.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrey Panin 2005-09-06 15:18:28 -07:00 committed by Linus Torvalds
parent 4e70b9a3d6
commit c3c7120d55
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
arch/i386/kernel/dmi_scan.c
View File

@ -16,15 +16,25 @@ struct dmi_header {
static char * __init dmi_string(struct dmi_header *dm, u8 s)
{
u8 *bp = ((u8 *) dm) + dm->length;
char *str = "";
if (!s)
return "";
s--;
while (s > 0 && *bp) {
bp += strlen(bp) + 1;
if (s) {
s--;
}
return bp;
while (s > 0 && *bp) {
bp += strlen(bp) + 1;
s--;
}
if (*bp != 0) {
str = alloc_bootmem(strlen(bp) + 1);
if (str != NULL)
strcpy(str, bp);
else
printk(KERN_ERR "dmi_string: out of memory.\n");
}
}
return str;
}
/*
@ -84,19 +94,16 @@ static char *dmi_ident[DMI_STRING_MAX];
*/
static void __init dmi_save_ident(struct dmi_header *dm, int slot, int string)
{
char *d = (char*)dm;
char *p = dmi_string(dm, d[string]);
char *p, *d = (char*) dm;
if (p == NULL || *p == 0)
return;
if (dmi_ident[slot])
return;
dmi_ident[slot] = alloc_bootmem(strlen(p) + 1);
if(dmi_ident[slot])
strcpy(dmi_ident[slot], p);
else
printk(KERN_ERR "dmi_save_ident: out of memory.\n");
p = dmi_string(dm, d[string]);
if (p == NULL)
return;
dmi_ident[slot] = p;
}
/*