Update of /cvsroot/sblim/sfcb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23962
Modified Files:
httpComm.c instance.c
Log Message:
Bugs fixed: 1230292 Compile errors.
Index: httpComm.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/httpComm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- httpComm.c 26 Jun 2005 21:52:08 -0000 1.3
+++ httpComm.c 30 Jun 2005 11:36:08 -0000 1.4
@@ -44,8 +44,7 @@
if (!SSL_library_init()) {
fprintf(stderr, "** OpenSSL initialization failed!\n");
exit(-1);
- }Frank Scheffler
- * Contributions:
+ }
SSL_load_error_strings();
RAND_load_file("/dev/urandom", 1024);
}
Index: instance.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/instance.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- instance.c 28 Jun 2005 20:36:09 -0000 1.7
+++ instance.c 30 Jun 2005 11:36:08 -0000 1.8
@@ -214,24 +214,34 @@
CMPIData data = { type, CMPI_goodValue, {0} };
int rc;
- if (type == CMPI_chars)
+ if (type == CMPI_chars) {
+ /* VM: is this OK or do we need a __new copy */
data.value.chars = (char *) value;
- else if (type == CMPI_string) {
- if (value && value->string && value->string->hdl)
- data.value.chars = (char *) value->string->hdl;
- else data.value.chars=NULL;
+ if (value == NULL) {
+ data.state=CMPI_nullValue;
+ }
+ } else if (type == CMPI_string) {
data.type=CMPI_chars;
- data.state=CMPI_nullValue;
- }
- else if (type == CMPI_dateTime) {
- if (value == NULL);
- else {
- data.state = CMPI_nullValue;
- }
-
- else if (type == CMPI_sint64 || type == CMPI_uint64 || type == CMPI_real64)
+ if (value && value->string && value->string->hdl) {
+ /* VM: is this OK or do we need a __new copy */
+ data.value.chars = (char *) value->string->hdl;
+ } else {
+ data.value.chars=NULL;
+ data.state=CMPI_nullValue;
+ }
+ } else if (type == CMPI_dateTime) {
+ if (value && value->dateTime) {
+ /* VM: is this OK or do we need a __new copy */
+ data.value.dateTime = value->dateTime;
+ } else {
+ data.value.dateTime=NULL;
+ data.state=CMPI_nullValue;
+ }
+ } else if (type == CMPI_sint64 || type == CMPI_uint64 || type == CMPI_real64) {
data.value = *value;
- else data.value.Int = value->Int;
+ } else {
+ data.value.Int = value->Int;
+ }
if (i->filtered == 0 ||
i->property_list == NULL ||
@@ -575,5 +585,5 @@
/*** Local Variables: ***/
/*** mode: C ***/
-/*** c-basic-offset: 8 ***/
+/*** c-basic-offset: 3 ***/
/*** End: ***/
|
