? erp.diff
Index: wsmanbuffer.c
===================================================================
RCS file: /cvsroot/omi/protocol/wsmanbuffer.c,v
retrieving revision 1.7
diff -r1.7 wsmanbuffer.c
25a26
> #include <stdarg.h>
410c411
< MI_INLINE MI_Boolean _Field_GetExists(
---
> INLINE MI_Boolean _Field_GetExists(
616a618,651
> #if defined(CONFIG_FAVORSIZE)
> MI_Result WSBuf_AddLits(
>     WS_Buffer* buf,
>     ...)
> {
>     va_list ap;
> 
>     va_start(ap, buf);
> 
>     for (;;)
>     {
>         const char* str;
>         size_t len;
>         MI_Result r;
>         
>         str = va_arg(ap, const char*);
> 
>         if (!str)
>             break;
> 
>         len = va_arg(ap, size_t);
> 
>         r = WSBuf_AddLit(buf, str, len);
> 
>         if (r != MI_RESULT_OK)
>             return r;
>     }
> 
>     va_end(ap);
> 
>     return MI_RESULT_OK;
> }
> #endif /* defined(CONFIG_FAVORSIZE) */
> 
749a785,795
> #if defined(CONFIG_FAVORSIZE)
> 
>     return WSBuf_AddLits(
>         buf, 
>         LIT("<p:"), 
>         name, Zlen(name),
>         LIT(">"), 
>         NULL);
> 
> #else
> 
759a806,807
> 
> #endif
765a814,824
> #if defined(CONFIG_FAVORSIZE)
> 
>     return WSBuf_AddLits(
>         buf,
>         LIT("</p:"),
>         name, Zlen(name),
>         LIT(">\n"),
>         NULL);
> 
> #else
> 
775a835,836
> 
> #endif
793a855,874
> #if defined(CONFIG_FAVORSIZE)
> 
>     if (start)
>     {
>         return WSBuf_AddLits(
>             buf,
>             LIT(MI_T("<wsman:Selector Name=\"")),
>             name, Zlen(name),
>             "\">",
>             NULL);
>     }
>     else
>     {
>         return WSBuf_AddLit(
>             buf, 
>             LIT(MI_T("</wsman:Selector>") XML_CR));
>     }
> 
> #else
> 
796c877,878
<         if ( MI_RESULT_OK != WSBuf_AddLit(buf,LIT(MI_T("<wsman:Selector Name=\""))) ||
---
>         if ( MI_RESULT_OK != WSBuf_AddLit(buf,
>                 LIT(MI_T("<wsman:Selector Name=\""))) ||
798,799c880,881
<             MI_RESULT_OK != WSBuf_AddLit2(buf, '"', '>')
<             )
---
>             MI_RESULT_OK != WSBuf_AddLit2(buf, '"', '>'))
>         {
800a883
>         }
804,805c887,889
<         if ( MI_RESULT_OK != WSBuf_AddLit(buf,LIT(MI_T("</wsman:Selector>") XML_CR)) 
<             )
---
>         if (MI_RESULT_OK != WSBuf_AddLit(buf,
>             LIT(MI_T("</wsman:Selector>") XML_CR)))
>         {
806a891
>         }
809a895,896
> 
> #endif
816c903,913
<     if ( MI_RESULT_OK != WSBuf_AddLit3(buf, '<', 'p', ':') ||
---
> #if defined(CONFIG_FAVORSIZE)
> 
>     return WSBuf_AddLits(
>         buf, 
>         LIT("<p:"),
>         name, Zlen(name),
>         LIT(MI_T(" xsi:nil=\"true\"/>") XML_CR));
> 
> #else
> 
>     if (MI_RESULT_OK != WSBuf_AddLit3(buf, '<', 'p', ':') ||
818c915,917
<         MI_RESULT_OK != WSBuf_AddLit(buf,LIT(MI_T(" xsi:nil=\"true\"/>") XML_CR)) )
---
>         MI_RESULT_OK != WSBuf_AddLit(buf,
>             LIT(MI_T(" xsi:nil=\"true\"/>") XML_CR)))
>     {
819a919
>     }
821a922,923
> 
> #endif
858,859c960
<     if (WSBuf_AddLit3(buf, '<', 'p', ':') != MI_RESULT_OK)
<         return MI_RESULT_FAILED;
---
> #if defined(CONFIG_FAVORSIZE)
861,862c962,970
<     if (WSBuf_AddStringNoEncoding(buf, name) != MI_RESULT_OK)
<         return MI_RESULT_FAILED;
---
>     if (WSBuf_AddLits(
>         buf,
>         LIT("<p:"),
>         name, Zlen(name),
>         LIT(MI_T(" xsi:type=\"cim:cimBase64Binary\">")),
>         NULL) != MI_RESULT_OK)
>     {
>         return -1;
>     }
864,865c972,977
<     if (WSBuf_AddLit(buf,
<         LIT(MI_T(" xsi:type=\"cim:cimBase64Binary\">"))) != MI_RESULT_OK)
---
> #else
> 
>     if (WSBuf_AddLit3(buf, '<', 'p', ':') != MI_RESULT_OK ||
>         WSBuf_AddStringNoEncoding(buf, name) != MI_RESULT_OK ||
>         WSBuf_AddLit(buf,
>             LIT(MI_T(" xsi:type=\"cim:cimBase64Binary\">"))) != MI_RESULT_OK)
869a982,983
> #endif
> 
1202a1317,1336
> #if defined(CONFIG_FAVORSIZE)
> 
>     if (WSBuf_AddLits(
>         buf,
>         LIT("<wsa:Address>"),
>         LIT("http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous"),
>         LIT("</wsa:Address>" XML_CR),
>         LIT("<wsa:ReferenceParameters>" XML_CR),
>         LIT("<wsman:ResourceURI>"),
>         LIT("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/"),
>         cd->name, Zlen(cd->name),
>         LIT("</wsman:ResourceURI>" XML_CR),
>         LIT("<wsman:SelectorSet>" XML_CR),
>         NULL) != MI_RESULT_OK)
>     {
>         return MI_RESULT_FAILED;
>     }
> 
> #else
> 
1211a1346,1347
> #endif
> 
1241,1242c1377,1381
<     if ( MI_RESULT_OK != WSBuf_AddLit(buf,LIT(MI_T("</wsman:SelectorSet>") XML_CR
<             MI_T("</wsa:ReferenceParameters>") XML_CR )) )
---
>     if (WSBuf_AddLit(
>         buf,
>         LIT("</wsman:SelectorSet>" XML_CR
>         "</wsa:ReferenceParameters>" XML_CR)) != MI_RESULT_OK)
>     {
1243a1383
>     }
1279a1420
>     size_t nameLen = Zlen(cd->name);
1294a1436,1472
> #if defined(CONFIG_FAVORSIZE)
> 
>         if (WSBuf_AddLits(
>             buf,
>             LIT("<p:"),
>             cd->name, nameLen,
>             LIT(" xmlns:p=\""),
>             LIT("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/"),
>             cd->name, nameLen,
>             LIT("\"\n"),
>             NULL) != MI_RESULT_OK)
>         {
>             return MI_RESULT_FAILED;
>         }
> 
>         if (embedded)
>         {
>             if (WSBuf_AddLits(
>                 buf,
>                 LIT(" xsi:type=\""),
>                 cd->name, nameLen,
>                 LIT("_Type\"" XML_CR),
>                 NULL) != MI_RESULT_OK)
>             {
>                 return MI_RESULT_FAILED;
>             }
>         }
> 
>         if (WSBuf_AddLits(
>             buf,
>             LIT(">\n"),
>             NULL) != MI_RESULT_OK)
>         {
>             return MI_RESULT_FAILED;
>         }
> 
> #else
1309a1488
> 
1312a1492,1493
> #endif
> 
1344a1526,1539
> #if defined(CONFIG_FAVORSIZE)
> 
>         if (WSBuf_AddLits(
>             buf,
>             LIT("</p:"),
>             cd->name, nameLen,
>             LIT(">\n"),
>             NULL) != MI_RESULT_OK)
>         {
>             return MI_RESULT_OK;
>         }
> 
> #else
> 
1349a1545,1546
> 
> #endif
1479a1677,1741
>     /* Generate new uniqueue msg id */
>     WSBuf_GenerateMessageID(msgID);
> 
> #if defined(CONFIG_FAVORSIZE)
> 
>     if (WSBuf_AddLits(
>         buf,
>         LIT("<SOAP-ENV:Envelope "),
>         /* SOAP-ENV */
>         LIT("xmlns:SOAP-ENV=\""),
>         LIT("http://www.w3.org/2003/05/soap-envelope"),
>         LIT("\" "),
>         /* wsa */
>         LIT("xmlns:wsa=\""),
>         LIT("http://schemas.xmlsoap.org/ws/2004/08/addressing"),
>         LIT("\" "),
>         /* wsen */
>         LIT("xmlns:wsen=\""),
>         LIT("http://schemas.xmlsoap.org/ws/2004/09/enumeration"),
>         LIT("\" "),
>         /* xsi */
>         LIT("xmlns:xsi=\""),
>         LIT("http://www.w3.org/2001/XMLSchema-instance"),
>         LIT("\" "),
>         /* wsmb */
>         LIT("xmlns:wsmb=\""),
>         LIT("http://schemas.dmtf.org/wbem/wsman/1/cimbinding.xsd"),
>         LIT("\" "),
>         /* wsman */
>         LIT("xmlns:wsman=\""),
>         LIT("http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"),
>         LIT("\" "),
>         /* wsf */
>         LIT("xmlns:wxf=\""),
>         LIT("http://schemas.xmlsoap.org/ws/2004/09/transfer"),
>         LIT("\" "),
>         /* xml */
>         LIT("xmlns:xml=\""),
>         LIT("http://www.w3.org/XML/1998/namespace"),
>         LIT("\" "),
>         /* wsmid */
>         LIT("xmlns:wsmid=\""),
>         LIT("http://schemas.dmtf.org/wbem/wsman/identity/1/wsmanidentity.xsd"),
>         LIT("\" >" XML_CR),
>         /* close */
>         LIT("<SOAP-ENV:Header>" XML_CR),
>         /* wsa:To */
>         LIT("<wsa:To>"),
>         LIT("http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous"),
>         LIT("</wsa:To>" XML_CR),
>         /* Action */
>         LIT("<wsa:Action>"),
>         action, actionSize,
>         LIT("</wsa:Action>" XML_CR),
>         /* MessageID */
>         LIT("<wsa:MessageID>"),
>         msgID, WS_MSG_ID_SIZE - 1,
>         LIT("</wsa:MessageID>" XML_CR),
>         NULL))
>     {
>         goto failed;
>     }
> 
> #else
> 
1509,1511d1770
<     /* Generate new uniqueue msg id */
<     WSBuf_GenerateMessageID(msgID);
< 
1518a1778,1779
> #endif
> 
1520a1782,1795
> #if defined(CONFIG_FAVORSIZE)
> 
>         if (WSBuf_AddLits(
>             buf,
>             LIT("<wsa:RelatesTo>"),
>             relatesTo, Zlen(relatesTo),
>             LIT("</wsa:RelatesTo>" XML_CR),
>             NULL) != MI_RESULT_OK)
>         {
>             goto failed;
>         }
> 
> #else
> 
1530a1806,1807
> 
> #endif
1570a1848,1861
> #if defined(CONFIG_FAVORSIZE)
> 
>         if (WSBuf_AddLits(
>             &outBuf,
>             LIT("<SOAP-ENV:NotUnderstood qname=\""),
>             notUnderstoodTag, Zlen(notUnderstoodTag),
>             LIT("\"/>"),
>             NULL) != MI_RESULT_OK)
>         {
>             goto failed;
>         }
> 
> #else 
> 
1579a1871,1872
> 
> #endif
1600a1894,1909
> #if defined(CONFIG_FAVORSIZE)
> 
>         if (WSBuf_AddLits(
>             &outBuf,
>             LIT("<SOAP-ENV:Subcode>" XML_CR),
>             LIT("<SOAP-ENV:Value>"),
>             fault->subCode, Zlen(fault->subCode),
>             LIT("</SOAP-ENV:Value>" XML_CR),
>             LIT("</SOAP-ENV:Subcode>" XML_CR),
>             NULL) != MI_RESULT_OK)
>         {
>             goto failed;
>         }
> 
> #else
> 
1612a1922
> #endif
Index: wsmanbuffer.h
===================================================================
RCS file: /cvsroot/omi/protocol/wsmanbuffer.h,v
retrieving revision 1.1
diff -r1.1 wsmanbuffer.h
102a103,107
> /* Append string literals to the buffer. The last argument must be NULL */
> MI_Result WSBuf_AddLits(
>     WS_Buffer* buf,
>     ...);
>