Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2202
Modified Files:
OSBase_BaseBoard.c ChangeLog
Log Message:
bug# 1179049: switched value of Vendor and Model on PPC; fixed SerialNumber
from 9 digits to 7 valid digits
Index: OSBase_BaseBoard.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/OSBase_BaseBoard.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- OSBase_BaseBoard.c 24 Jan 2005 11:29:05 -0000 1.1
+++ OSBase_BaseBoard.c 8 Apr 2005 08:18:37 -0000 1.2
@@ -141,17 +141,17 @@
strncpy(data->vendor,buffer,strlen(buffer)-strlen(ptr));
ptr+=1;
if( !(str=strchr(ptr,'-')) ) {
- data->model = calloc(1,5);
- strncpy(data->model,ptr,4);
+ data->type = calloc(1,5);
+ strncpy(data->type,ptr,4);
ptr+=4;
- data->type = calloc(1,strlen(ptr)+1);
- strcpy(data->type,ptr);
+ data->model = calloc(1,strlen(ptr)+1);
+ strcpy(data->model,ptr);
} else {
- data->model = calloc(1,strlen(ptr)-strlen(str)+1);
- strncpy(data->model,ptr,strlen(ptr)-strlen(str));
+ data->type = calloc(1,strlen(ptr)-strlen(str)+1);
+ strncpy(data->type,ptr,strlen(ptr)-strlen(str));
str+=1;
- data->type = calloc(1,strlen(str)+1);
- strcpy(data->type,str);
+ data->model = calloc(1,strlen(str)+1);
+ strcpy(data->model,str);
}
}
fclose(fhd);
@@ -165,7 +165,7 @@
} else {
ptr+=1;
data->serialNumber = calloc(1,strlen(ptr)+1);
- strcpy(data->serialNumber,ptr);
+ strcpy(data->serialNumber,ptr+2); /* +2 since 1st two chars are for something else(?) */
}
fclose(fhd);
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog 6 Apr 2005 16:29:47 -0000 1.1
+++ ChangeLog 8 Apr 2005 08:18:37 -0000 1.2
@@ -63,5 +63,9 @@
* restructured init process for SBLIM tracing into a file
* ported OperatingSystem's process indication of OperationalStatus
to become a life-cycle indication
+* bug# 1178575: fixed seg fault of OperatingSystem's
+ IndicationCleanup()
+* bug# 1179049: switched BaseBoard's values of Vendor and Model on
+ PPC
// ===================================================================
|
