Attachment 713712 Details for Bug 919377 – Proposed patch

[patch] Proposed patch

sblim-sfcb-1.3.16-embedded-instance.patch (text/plain), 2.09 KB, created by Vitezslav Crhonek on 2013-03-21 09:59:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vitezslav Crhonek

Created: 2013-03-21 09:59:50 UTC

Size: 2.09 KB

patch

obsolete

>diff -up sblim-sfcb-1.3.16/cimXmlGen.c.orig sblim-sfcb-1.3.16/cimXmlGen.c
>--- sblim-sfcb-1.3.16/cimXmlGen.c.orig	2012-12-12 23:09:30.000000000 +0100
>+++ sblim-sfcb-1.3.16/cimXmlGen.c	2013-03-21 10:50:41.309088109 +0100
>@@ -682,10 +682,9 @@ void data2xml(CMPIData * data, void *obj
>       if (data->type == CMPI_refA) {
>          SFCB_APPENDCHARS_BLOCK(sb, "reference");
>       }
>-      else if(((data->type & ~CMPI_ARRAY) == CMPI_instance) 
>-               || ((data->type & ~CMPI_ARRAY) == CMPI_class)) {
>-         SFCB_APPENDCHARS_BLOCK(sb, "string\" EmbeddedObject=\"object");
>-      } else {
>+      else if((data->type & ~CMPI_ARRAY) == CMPI_instance) SFCB_APPENDCHARS_BLOCK(sb, "string\" EmbeddedObject=\"instance");
>+      else if((data->type & ~CMPI_ARRAY) == CMPI_class) SFCB_APPENDCHARS_BLOCK(sb, "string\" EmbeddedObject=\"object");
>+      else {
>           sb->ft->appendChars(sb, dataType(data->type));
>       }
>       SFCB_APPENDCHARS_BLOCK(sb, "\">\n");
>@@ -736,7 +735,7 @@ void data2xml(CMPIData * data, void *obj
>       else if (*type == '%') {                  
> 	     sb->ft->appendBlock(sb, bTag, bTagLen);
>          sb->ft->appendChars(sb, (char *) name->hdl);
>-         SFCB_APPENDCHARS_BLOCK(sb, "\" EmbeddedObject=\"object");
>+         SFCB_APPENDCHARS_BLOCK(sb, "\" EmbeddedObject=\"instance");
>          if (param) SFCB_APPENDCHARS_BLOCK(sb, "\" PARAMTYPE=\"string\">\n");
>          else SFCB_APPENDCHARS_BLOCK(sb, "\" TYPE=\"string\">\n");
>          if(data->value.inst) {
>diff -up sblim-sfcb-1.3.16/objectImpl.c.orig sblim-sfcb-1.3.16/objectImpl.c
>--- sblim-sfcb-1.3.16/objectImpl.c.orig	2012-05-19 01:46:01.000000000 +0200
>+++ sblim-sfcb-1.3.16/objectImpl.c	2013-03-21 10:50:19.736967825 +0100
>@@ -894,7 +894,7 @@ int ClClassAddPropertyQualifierSpecial(C
> {
>    if (strcasecmp(id, "key") == 0)
>       p->quals |= ClProperty_Q_Key;
>-   else if (strcasecmp(id, "embeddedobject") == 0)
>+   else if (strcasecmp(id, "embeddedobject") == 0 || strcasecmp(id, "embeddedinstance") == 0)
>       p->quals |= ClProperty_Q_EmbeddedObject;
>    else
>        return ClClassAddQualifierSpecial(hdr, &p->qualifiers, id, d, arrHdr);

Actions: View | Diff

Attachments on bug 919377: 713712